v3.7.1

=====================================================================

--- Bug Fixes ----------------------------

- Various github-actions fixes

.github/workflows/test.yaml

@@ -0,0 +1,16 @@
+---
+name: Random Test
+on: push  # yamllint disable-line rule:truthy
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: run a scwrypts thing
+        uses: wrynegade/scwrypts@main
+        with:
+          scwrypt: --name hello-world --group scwrypts --type py
+          args: --message "hello from github actions ci <3"
+
+      - name: cat config stuff
+        shell: bash
+        run: ls ~/.config/scwrypts; cat ~/.config/scwrypts/*

README.md

@@ -48,8 +48,6 @@ There are a few notable changes to this runtime:
 - User yes/no prompts will **always be YES**
 - Other user input will default to an empty string
 - Logs will not be captured
-- Setting the environment variable `SCWRYPTS_GROUP_LOADER__[a-z_]\+` will source the file indicated in the variable (this allows custom groups without needing to modify the `config.zsh` directly)
-	- In GitHub actions, `*.scwrypts.zsh` groups are detected automatically from the `$GITHUB_WORKSPACE`; set `SCWRYPTS_GITHUB_NO_AUTOLOAD=true` to disable
 
 
 ## Contributing

action.yaml

@@ -27,7 +27,7 @@ runs:
     - uses: actions/checkout@v4
       with:
         repository: wrynegade/scwrypts
-        path: ./wrynegade/scwrypts
+        path: $HOME/scwrypts
         ref: ${{ inputs.version }}
 
     - name: check dependencies
@@ -43,7 +43,7 @@ runs:
           sudo apt-get update
           sudo apt-get install --yes zsh fzf ripgrep
 
-          for D in $($GITHUB_WORKSPACE/wrynegade/scwrypts/scwrypts -n --name check-all-dependencies --group ci --type zsh)
+          for D in $($HOME/scwrypts/scwrypts -n --name check-all-dependencies --group ci --type zsh)
           do
             echo "--- installing $D ---"
             ( sudo apt-get install --yes $D; exit 0; )
@@ -51,7 +51,7 @@ runs:
         } > $HOME/.scwrypts.apt-get.log 2>&1
 
         echo "updating virtual dependencies"
-        $GITHUB_WORKSPACE/wrynegade/scwrypts/scwrypts -n \
+        $HOME/scwrypts/scwrypts -n \
           --name scwrypts/virtualenv/update-all \
           --group scwrypts \
           --type zsh \
@@ -65,4 +65,4 @@ runs:
       env:
         CI: true
         SCWRYPTS_ENV: ${{ inputs.scwrypts-env }}
-      run: $GITHUB_WORKSPACE/wrynegade/scwrypts/scwrypts ${{inputs.scwrypt}} -- ${{inputs.args}} || exit 1
+      run: $HOME/scwrypts/scwrypts ${{inputs.scwrypt}} -- ${{inputs.args}} || exit 1

plugins/kubectl/driver/kubectl.completion.zsh

@@ -2,45 +2,30 @@
 command -v compdef >/dev/null 2>&1 || return 0
 #####################################################################
 
-for CLI in kubectl helm flux
+_k() {
-do
+	local C=$(k meta get context)
-	eval "_${CLI[1]}() {
+	local NS=$(k meta get namespace)
-		local SUBSESSION=0
-		echo \${words[2]} | grep -q '^[0-9]\\+$' && SUBSESSION=\${words[2]}
 
-		local PASSTHROUGH_WORDS=($CLI)
+	local KUBEWORDS=(kubectl)
-		[[ \$CURRENT -gt 2 ]] && echo \${words[2]} | grep -qv '^[0-9]\\+$' && {
+	[ $C  ] && KUBEWORDS+=(--context $C)
-			local KUBECONTEXT=\$(k \$SUBSESSION meta get context)
+	[ $NS ] && KUBEWORDS+=(--namespace $NS)
-			local NAMESPACE=\$(k \$SUBSESSION meta get namespace)
 
-			[ \$KUBECONTEXT ] \
+	words="$KUBEWORDS ${words[@]:1}"
-				&& PASSTHROUGH_WORDS+=($([[ $CLI =~ ^helm$ ]] && echo '--kube-context' || echo '--context') \$KUBECONTEXT) \
+	_kubectl
-				;
+}
-			[ \$NAMESPACE   ] \
-				&& PASSTHROUGH_WORDS+=(--namespace \$NAMESPACE) \
-				;
-		}
 
-		local DELIMIT_COUNT=0
+compdef _k  k
-		local WORD
-		for WORD in \${words[@]:1}
-		do
-			case \$WORD in
-				[0-9]* ) continue ;;
-				-- )
-					echo \$words | grep -q 'exec' && ((DELIMIT_COUNT+=1))
-					[[ \$DELIMIT_COUNT -eq 0 ]] && ((DELIMIT_COUNT+=1)) && continue
-					;;
-			esac
-			PASSTHROUGH_WORDS+=(\"\$WORD\")
-		done
 
-		echo \"\$words\" | grep -q '\\s\\+$' && PASSTHROUGH_WORDS+=(' ')
+#####################################################################
+_h() {
+	local C=$(k meta get context)
+	local NS=$(k meta get namespace)
 
-		words=\"\$PASSTHROUGH_WORDS\"
+	local KUBEWORDS=(kubectl)
-		_$CLI
+	[ $C  ] && KUBEWORDS+=(--context $C)
-	}
+	[ $NS ] && KUBEWORDS+=(--namespace $NS)
-	"
 
-	compdef _${CLI[1]} ${CLI[1]}
+	words="$KUBEWORDS ${words[@]:1}"
-done
+	_helm
+}
+compdef _h  h

plugins/kubectl/driver/kubectl.driver.zsh

@@ -3,7 +3,6 @@
 unalias k h >/dev/null 2>&1
 k() { _SCWRYPTS_KUBECTL_DRIVER kubectl $@; }
 h() { _SCWRYPTS_KUBECTL_DRIVER helm $@; }
-f() { _SCWRYPTS_KUBECTL_DRIVER flux $@; }
 
 
 _SCWRYPTS_KUBECTL_DRIVER() {
@@ -58,7 +57,7 @@ _SCWRYPTS_KUBECTL_DRIVER() {
 	"
 
 	local USAGE__description="
-		Provides 'k' (kubectl), 'h' (helm), and 'f' (flux) shorthands to the respective
+		Provides 'k' (kubectl) and 'h' (helm) shorthands to the respective
 		utility. These functions leverage redis and scwrypts environments to
 		allow quick selection of contexts and namespaces usable across all
 		active shell instances.
@@ -101,20 +100,18 @@ _SCWRYPTS_KUBECTL_DRIVER() {
 			--subsession ) SUBSESSION=$2; shift 1 ;;
 
 			-n | --namespace )
-				_SCWRYPTS_KUBECTL_DRIVER kubectl meta set namespace $2
+				echo "TODO: set namespace ('$2')" >&2
-				shift 1
+				USER_ARGS+=(--namespace $2); shift 1
 				;;
 
 			-k | --context | --kube-context )
-				_SCWRYPTS_KUBECTL_DRIVER kubectl meta set context $2
+				echo "TODO: set context ('$2')" >&2
+				[[ $CLI =~ ^helm$    ]] && USER_ARGS+=(--kube-context $2)
+				[[ $CLI =~ ^kubectl$ ]] && USER_ARGS+=(--context $2)
 				shift 1
 				;;
 
-			-- )
+			-- ) shift 1; break ;;
-				echo $USER_ARGS | grep -q 'exec' && USER_ARGS+=(--)
-				shift 1
-				break
-				;;
 
 			* )
 				[ ! $CUSTOM_COMMAND ] && {
@@ -152,7 +149,6 @@ _SCWRYPTS_KUBECTL_DRIVER() {
 
 			[ $CONTEXT ] && [[ $CLI =~ ^helm$    ]] && CLI_ARGS+=(--kube-context $CONTEXT)
 			[ $CONTEXT ] && [[ $CLI =~ ^kubectl$ ]] && CLI_ARGS+=(--context $CONTEXT)
-			[ $CONTEXT ] && [[ $CLI =~ ^flux$    ]] && CLI_ARGS+=(--context $CONTEXT)
 
 			[[ $STRICT -eq 1 ]] && {
 				[ $CONTEXT   ] || ERROR "missing kubectl 'context'"

plugins/kubectl/driver/meta.zsh

@@ -30,15 +30,8 @@ SCWRYPTS_KUBECTL_CUSTOM_COMMAND_PARSE__meta() {
 				USAGE__args="set (namespace|context)"
 				USAGE__description="interactively set a namespace or context for '$SCWRYPTS_ENV'"
 				case $2 in
-					namespace | context ) USER_ARGS+=($1 $2 $3); [ $3 ] && shift 1 ;;
+					namespace | context ) USER_ARGS+=($1 $2) ;;
 					-h | --help ) HELP=1 ;;
-					'' )
-						: \
-							&& SCWRYPTS_KUBECTL_CUSTOM_COMMAND__meta set context \
-							&& SCWRYPTS_KUBECTL_CUSTOM_COMMAND__meta set namespace \
-							;
-						return $?
-						;;
 
 					* ) ERROR "cannot set '$2'" ;;
 				esac
@@ -101,7 +94,7 @@ SCWRYPTS_KUBECTL_CUSTOM_COMMAND__meta() {
 			;;
 
 		set )
-			scwrypts -n --name set-$2 --type zsh --group kubectl -- $3 --subsession $SUBSESSION >/dev/null \
+			scwrypts -n --name set-$2 --type zsh --group kubectl -- --subsession $SUBSESSION >/dev/null \
 				&& SUCCESS "$2 set"
 			;;
 

plugins/kubectl/lib/kubectl.module.zsh

@@ -21,6 +21,7 @@ KUBECTL() {
 	kubectl ${KUBECTL_ARGS[@]} $@
 }
 
+
 #####################################################################
 
 KUBECTL__GET_CONTEXT() { REDIS get --prefix "current:context"; }
@@ -86,73 +87,3 @@ KUBECTL__LIST_NAMESPACES() {
 	echo default
 	KUBECTL get namespaces -o name | sed 's/^namespace\///' | sort
 }
-
-#####################################################################
-
-KUBECTL__SERVE() {
-	[ $CONTEXT ] || local CONTEXT=$(KUBECTL__GET_CONTEXT)
-	[ $CONTEXT ] || ERROR 'must configure a context in which to serve'
-
-	[ $NAMESPACE ] || local NAMESPACE=$(KUBECTL__GET_NAMESPACE)
-	[ $NAMESPACE ] || ERROR 'must configure a namespace in which to serve'
-
-	CHECK_ERRORS --no-fail --no-usage || return 1
-
-	[ $SERVICE ] && SERVICE=$(KUBECTL__LIST_SERVICES | jq -c "select (.service == \"$SERVICE\")" || echo $SERVICE)
-	[ $SERVICE ] || local SERVICE=$(KUBECTL__SELECT_SERVICE)
-	[ $SERVICE ] || ERROR 'must provide or select a service'
-
-	KUBECTL__LIST_SERVICES | grep -q "^$SERVICE$"\
-		|| ERROR "no service '$SERVICE' in '$CONFIG/$NAMESPACE'"
-
-	CHECK_ERRORS --no-fail --no-usage || return 1
-
-	##########################################
-
-	SERVICE_PASSWORD="$(KUBECTL__GET_SERVICE_PASSWORD)"
-	KUBECTL__SERVICE_PARSE
-
-	INFO "attempting to serve ${NAMESPACE}/${SERVICE_NAME}:${SERVICE_PORT}"
-	[ $SERVICE_PASSWORD ] && INFO "password : $SERVICE_PASSWORD"
-
-	KUBECTL port-forward service/$SERVICE_NAME $SERVICE_PORT
-}
-
-KUBECTL__SELECT_SERVICE() {
-	[ $NAMESPACE ] || local NAMESPACE=$(KUBECTL__GET_NAMESPACE)
-	[ $NAMESPACE ] || return 1
-
-	local SERVICES=$(KUBECTL__LIST_SERVICES)
-	local SELECTED=$({
-		echo "namespace service port"
-		echo $SERVICES \
-			| jq -r '.service + " " + .port' \
-			| sed "s/^/$NAMESPACE /" \
-			;
-	} \
-		| column -t \
-		| FZF 'select a service' --header-lines=1 \
-		| awk '{print $2;}' \
-	)
-
-	echo $SERVICES | jq -c "select (.service == \"$SELECTED\")"
-}
-
-KUBECTL__LIST_SERVICES() {
-	KUBECTL get service --no-headers\
-		| awk '{print "{\"service\":\""$1"\",\"ip\":\""$3"\",\"port\":\""$5"\"}"}' \
-		| jq -c 'select (.ip != "None")' \
-		;
-}
-
-KUBECTL__GET_SERVICE_PASSWORD() {
-	[ $PASSWORD_SECRET ] && [ $PASSWORD_KEY ] || return 0
-
-	KUBECTL get secret $PASSWORD_SECRET -o jsonpath="{.data.$PASSWORD_KEY}" \
-		| base64 --decode
-}
-
-KUBECTL__SERVICE_PARSE() {
-	SERVICE_NAME=$(echo $SERVICE | jq -r .service)
-	SERVICE_PORT=$(echo $SERVICE | jq -r .port | sed 's|/.*$||')
-}

plugins/kubectl/serve

@@ -1,58 +0,0 @@
-#!/bin/zsh
-#####################################################################
-DEPENDENCIES+=()
-REQUIRED_ENV+=()
-
-use kubectl --group kubectl
-
-CHECK_ENVIRONMENT
-#####################################################################
-
-MAIN() {
-	local USAGE="
-	usage: [service] [...options...]
-
-	args:
-	  service   (optional) name of the service to forward locally
-
-	options:
-	  --context      override context
-	  --namespace    override namespace
-	  --subsession   REDIS subsession (default 0)
-
-	  to show a required password on screen, use both:
-	  --password-secret   Secret resource
-	  --password-key      key within Secret's 'data'
-
-	  -h, --help   show this dialogue and exit
-	"
-	local CONTEXT NAMESPACE SERVICE
-	local SUBSESSION=0
-
-	while [[ $# -gt 0 ]]
-	do
-		case $1 in
-			--context    ) CONTEXT=$2; shift 1 ;;
-			--namespace  ) NAMESPACE=$2; shift 1 ;;
-			--subsession ) SUBSESSION=$2; shift 1 ;;
-
-			--password-secret ) PASSWORD_SECRET=$2; shift 1 ;;
-			--password-key    ) PASSWORD_KEY=$2; shift 1 ;;
-
-			-h | --help ) USAGE; return 0 ;;
-
-			* )
-				[ $SERVICE ] && ERROR "unexpected argument '$2'"
-				SERVICE=$1
-				;;
-		esac
-		shift 1
-	done
-
-	CHECK_ERRORS
-
-	KUBECTL__SERVE 
-}
-
-#####################################################################
-MAIN $@

plugins/kubectl/set-context

@@ -17,8 +17,6 @@ MAIN() {
 
 	options:
 	  --subsession   REDIS subsession (default 0)
-
-	  -h, --help   show this dialogue and exit
 	"
 	local CONTEXT
 	local SUBSESSION=0
@@ -28,8 +26,6 @@ MAIN() {
 		case $1 in
 			--subsession ) SUBSESSION=$2; shift 1 ;;
 
-			-h | --help ) USAGE; return 0 ;;
-
 			* )
 				[ $CONTEXT ] && ERROR "unexpected argument '$2'"
 				CONTEXT=$1

plugins/kubectl/set-namespace

@@ -17,8 +17,6 @@ MAIN() {
 
 	options:
 	  --subsession   REDIS subsession (default 0)
-
-	  -h, --help   show this dialogue and exit
 	"
 	local NAMESPACE
 	local SUBSESSION=0
@@ -28,8 +26,6 @@ MAIN() {
 		case $1 in
 			--subsession ) SUBSESSION=$2; shift 1 ;;
 
-			-h | --help ) USAGE; return 0 ;;
-
 			* )
 				[ $NAMESPACE ] && ERROR "unexpected argument '$2'"
 				NAMESPACE=$1

run

@@ -6,35 +6,22 @@ source "${0:a:h}/zsh/lib/import.driver.zsh" || exit 42
 
 __RUN() {
 	local USAGE='
-		usage: scwrypts [... options ...] [patterns] -- [...script options...]
+		usage: scwrypts [OPTIONS ...] SCRIPT -- [SCRIPT OPTIONS ...]
 
-		options:
+		OPTIONS
-		  selection
+		  -g, --group <group-name>    only use scripts from the indicated group
-		    -m, --name <scwrypt-name>   only run the script if there is an exact match
+		  -t, --type <type-name>      only use scripts of the indicated type
-		                                  (requires type and group)
+		  -m, --name <scwrypt-name>   only run the script if there is an exact match 
-		    -g, --group <group-name>    only use scripts from the indicated group
+		                                (requires type and group)
-		    -t, --type <type-name>      only use scripts of the indicated type
 
-		  runtime
+		  -e, --env <env-name>   set environment; overwrites SCWRYPTS_ENV
-		    -y, --yes              auto-accept all [yn] prompts through current scwrypt
+		  -n, --no-log           skip logging and run in quiet mode
-		    -e, --env <env-name>   set environment; overwrites SCWRYPTS_ENV
-		    -q, --quiet            run in quiet mode
-		    -n, --no-log           skip the log file and run in quiet mode
-		    -v, --verbose          override quiet mode settings and print all debug dialogue
 
-		  alternate commands
+		  --update   update scwrypts library to latest version
-		    -h, --help        display this message and exit
-		    -l, --list        print out command list and exit
-		        --list-envs   print out environment list and exit
-		        --update      update scwrypts library to latest version
-		        --version     print out scwrypts version and exit
 
-		patterns:
+		  -v, --version   print out scwrypts version and exit
-		  - a list of glob patterns to loose-match a scwrypt by name
+		  -l, --list      print out command list and exit
-
+		  -h, --help      display this message and exit
-		script options:
-		  - everything after "--" is forwarded to the scwrypt you run
-		    (usually "-- --help" will provide more information)
 	'
 	cd "$SCWRYPTS_ROOT"
 
@@ -43,29 +30,58 @@ __RUN() {
 
 	local VARSPLIT SEARCH_GROUP SEARCH_TYPE SEARCH_NAME
 
-	local ALLOW_LOGFILE=1
-	local VERBOSE=1
-
-	[ $CI ] && [ ! $SCWRYPTS_CI_FORCE_NON_VERBOSE ] && VERBOSE=2
-
 	local ERROR=0
 
 	while [[ $# -gt 0 ]]
 	do
 		case $1 in
+			-t | --type )
+				[ ! $2 ] && ERROR "missing value for argument $1" && break
+				SEARCH_TYPE=$2
+				shift 2
+				;;
+			-g | --group )
+				[ ! $2 ] && ERROR "missing value for argument $1" && break
+				SEARCH_GROUP=$2
+				shift 2
+				;;
+			-m | --name )
+				[ ! $2 ] && ERROR "missing value for argument $1" && break
+				SEARCH_NAME=$2
+				shift 2
+				;;
+
 			-[a-z][a-z]* )
 				VARSPLIT=$(echo "$1 " | sed 's/^\(-.\)\(.*\) /\1 -\2/')
 				set -- $(echo " $VARSPLIT ") ${@:2}
 				;;
-
+			-h | --help )
-			-h | --help ) USAGE; return 0 ;;
+				USAGE
-			-l | --list ) SCWRYPTS__GET_AVAILABLE_SCWRYPTS; return 0 ;;
-			--list-envs ) SCWRYPTS__GET_ENV_NAMES; return 0 ;;
-			--version )
-				echo scwrypts $(git -C "$SCWRYPTS__ROOT__scwrypts" describe --tags)
 				return 0
 				;;
+			-n | --no-log )
+				[ ! $SUBSCWRYPT ] && SUBSCWRYPT=0
+				shift 1
+				;;
+			-e | --env )
+				[ ! $2 ] && ERROR "missing value for argument $1" && break
+				[ ! $SUBSCWRYPTS ] \
+					&& [ $ENV_NAME ] \
+					&& WARNING 'overwriting session environment' \
+					;
 
+				ENV_NAME="$2"
+				STATUS "using CLI environment '$ENV_NAME'"
+				shift 2
+				;;
+			-l | --list )
+				SCWRYPTS__GET_AVAILABLE_SCWRYPTS
+				return 0
+				;;
+			-v | --version )
+				echo scwrypts $(cd "$SCWRYPTS__ROOT__scwrypts"; git describe --tags)
+				return 0
+				;;
 			--update )
 				cd "$SCWRYPTS__ROOT__scwrypts"
 				git fetch --quiet origin main
@@ -88,53 +104,24 @@ __RUN() {
 				}
 				return 0
 				;;
-
+			-- )
-			-m | --name )
+				shift 1
-				[ ! $2 ] && ERROR "missing value for argument $1" && break
+				break # pass arguments after '--' to the scwrypt
-				SEARCH_NAME=$2
+				;;
+			--* )
+				ERROR "unrecognized argument '$1'"
 				shift 1
 				;;
-
+			* )
-			-g | --group )
+				SEARCH_PATTERNS+=($1)
-				[ ! $2 ] && ERROR "missing value for argument $1" && break
-				SEARCH_GROUP=$2
 				shift 1
 				;;
-
-			-t | --type )
-				[ ! $2 ] && ERROR "missing value for argument $1" && break
-				SEARCH_TYPE=$2
-				shift 1
-				;;
-
-			-y | --yes     ) export __SCWRYPTS_YES=1 ;;
-			-q | --quiet   ) VERBOSE=0 ;;
-			-n | --no-log  ) VERBOSE=0 ; [ ! $SUBSCWRYPT ] && SUBSCWRYPT=0 ;;
-			-v | --verbose ) VERBOSE=2 ;;
-
-			-e | --env )
-				[ ! $2 ] && ERROR "missing value for argument $1" && break
-				[ ! $SUBSCWRYPTS ] \
-					&& [ $ENV_NAME ] \
-					&& WARNING 'overwriting session environment' \
-					;
-
-				ENV_NAME="$2"
-				STATUS "using CLI environment '$ENV_NAME'"
-				shift 1
-				;;
-
-
-			--  ) shift 1; break ;; # pass arguments after '--' to the scwrypt
-			--* ) ERROR "unrecognized argument '$1'" ;;
-			*   ) SEARCH_PATTERNS+=($1) ;;
 		esac
-		shift 1
 	done
 
 	[ $SEARCH_NAME ] && {
-		[ $SEARCH_TYPE  ] || ERROR '--name requires --type argument'
+		[ ! $SEARCH_TYPE  ] && ERROR '--name requires --type argument'
-		[ $SEARCH_GROUP ] || ERROR '--name requires --group argument'
+		[ ! $SEARCH_GROUP ] && ERROR '--name requires --group argument'
 	}
 
 	CHECK_ERRORS
@@ -208,12 +195,9 @@ __RUN() {
 	local TYPE="$SEARCH_TYPE"
 	local GROUP="$SEARCH_GROUP"
 
-	[[ $(echo $SCWRYPTS_AVAILABLE | wc -l) -eq 2 ]] && {
+	[[ $(echo $SCWRYPTS_AVAILABLE | wc -l) -eq 2 ]] \
-		SCWRYPT_SELECTION=$(echo $SCWRYPTS_AVAILABLE | tail -n1)
+		&& SCWRYPT_SELECTION=$(echo $SCWRYPTS_AVAILABLE | tail -n1) \
-		[[ $VERBOSE -eq 2 ]] || VERBOSE=0
+		|| SCWRYPT_SELECTION=$(echo $SCWRYPTS_AVAILABLE | FZF "select a script to run" --header-lines 1)
-	} || {
-		SCWRYPT_SELECTION=$(echo $SCWRYPTS_AVAILABLE | FZF "select a script to run" --header-lines 1)
-	}
 	[ $SCWRYPT_SELECTION ] || exit 2
 
 	SCWRYPTS__SEPARATE_SCWRYPT_SELECTION $SCWRYPT_SELECTION
@@ -234,7 +218,6 @@ __RUN() {
 
 	[[ $ENV_REQUIRED -eq 1 ]] && {
 		[ ! $ENV_NAME ] && ENV_NAME=$(SCWRYPTS__SELECT_ENV)
-
 		for GROUP in ${SCWRYPTS_GROUPS[@]}
 		do
 			local ENV_FILE=$(SCWRYPTS__GET_ENV_FILE "$ENV_NAME" "$GROUP")
@@ -256,8 +239,7 @@ __RUN() {
 
 	##########################################
 
-	: \
+	[ ! $SUBSCWRYPT ] \
-		&& [ ! $SUBSCWRYPT ] \
 		&& [[ $ENV_NAME =~ prod ]] \
 		&& { __VALIDATE_UPSTREAM_TIMELINE || ABORT; }
 
@@ -271,7 +253,6 @@ __RUN() {
 	local LOGFILE=$(__GET_LOGFILE)
 
 	local HEADER=$(
-		[[ $VERBOSE -gt 0 ]] || return 0
 		[ $SUBSCWRYPT ] && return 0
 		echo '====================================================================='
 		echo "script : $SCWRYPT_GROUP $SCWRYPT_TYPE $SCWRYPT_NAME"
@@ -293,14 +274,14 @@ __RUN() {
 
 	{
 		[ $HEADER ] && echo $HEADER
-		[[ $VERBOSE -gt 0 ]] && echo '\033[1;33m--- BEGIN OUTPUT -------------------------\033[0m'
+		echo '\033[1;33m--- BEGIN OUTPUT -------------------------\033[0m'
 		(eval "$RUN_STRING $(printf "%q " "$@")")
 		EXIT_CODE=$?
-		[[ $VERBOSE -gt 0 ]] && echo '\033[1;33m--- END OUTPUT ---------------------------\033[0m'
+		echo '\033[1;33m--- END OUTPUT ---------------------------\033[0m'
 
 		[[ $EXIT_CODE -eq 0 ]] && EXIT_COLOR='32m' || EXIT_COLOR='31m'
 
-		[[ $VERBOSE -gt 0 ]] && echo "terminated with\\033[1;$EXIT_COLOR code $EXIT_CODE\\033[0m"
+		echo "terminated with\\033[1;$EXIT_COLOR code $EXIT_CODE\\033[0m"
 	} 2>&1 | tee --append "$LOGFILE"
 
 	exit $(\
@@ -342,9 +323,10 @@ __VALIDATE_UPSTREAM_TIMELINE() {
 }
 
 __GET_LOGFILE() {
-	[ $SUBSCWRYPT ] && return 0
+	[ $SUBSCWRYPT ] \
-	[[ $SCWRYPT_NAME =~ scwrypts/logs ]] && return 0
+		|| [[ $SCWRYPT_NAME =~ scwrypts/logs ]] \
-	[[ $SCWRYPT_NAME =~ interactive ]] && return 0
+		|| [[ $SCWRYPT_NAME =~ interactive ]] \
+		&& return 0
 
 	echo "$SCWRYPTS_LOG_PATH/$(echo $GROUP/$TYPE/$NAME | sed 's/^\.\///; s/\//\%/g').log"
 }

scwrypts.plugin.zsh

@@ -6,7 +6,7 @@ SCWRYPTS__ZSH_PLUGIN() {
 	local NAME
 	local TYPE
 	local GROUP
-	LBUFFER= RBUFFER=
+	zle clear-command-line
 	[ ! $SCWRYPT_SELECTION ] && { zle accept-line; return 0; }
 
 	SCWRYPTS__SEPARATE_SCWRYPT_SELECTION $SCWRYPT_SELECTION
@@ -14,40 +14,13 @@ SCWRYPTS__ZSH_PLUGIN() {
 	which scwrypts >/dev/null 2>&1\
 		&& RBUFFER="scwrypts" || RBUFFER="$SCWRYPTS_ROOT/scwrypts"
 
-	RBUFFER+=" --name $NAME --group $GROUP --type $TYPE --verbose"
+	RBUFFER+=" --name $NAME --group $GROUP --type $TYPE"
 	zle accept-line
 }
 
 zle -N scwrypts SCWRYPTS__ZSH_PLUGIN
 bindkey $SCWRYPTS_SHORTCUT scwrypts
 
-#####################################################################
-SCWRYPTS__ZSH_BUILDER_PLUGIN() {
-	local SCWRYPT_SELECTION=$(SCWRYPTS__GET_AVAILABLE_SCWRYPTS | FZF 'select a script' --header-lines 1)
-	local NAME
-	local TYPE
-	local GROUP
-	LBUFFER= RBUFFER=
-	[ ! $SCWRYPT_SELECTION ] && { zle accept-line; return 0; }
-
-	SCWRYPTS__SEPARATE_SCWRYPT_SELECTION $SCWRYPT_SELECTION
-
-	scwrypts --name $NAME --group $GROUP --type $TYPE -- --help >&2 || {
-		zle accept-line
-		return 0
-	}
-	echo
-
-	zle reset-prompt
-	which scwrypts >/dev/null 2>&1\
-		&& LBUFFER="scwrypts" || LBUFFER="$SCWRYPTS_ROOT/scwrypts"
-
-	LBUFFER+=" --name $NAME --group $GROUP --type $TYPE -- "
-}
-
-zle -N scwrypts-builder SCWRYPTS__ZSH_BUILDER_PLUGIN
-bindkey $SCWRYPTS_BUILDER_SHORTCUT scwrypts-builder
-
 #####################################################################
 SCWRYPTS__ZSH_PLUGIN_ENV() {
 	local RESET='reset'

zsh/cloud/aws/eks/login

@@ -7,4 +7,4 @@ use cloud/aws/eks
 CHECK_ENVIRONMENT
 #####################################################################
 
-EKS__CLUSTER_LOGIN $@
+EKS_CLUSTER_LOGIN $@

zsh/lib/cloud/aws/eks.module.zsh

@@ -1,44 +1,19 @@
 #####################################################################
 
-DEPENDENCIES+=(kubectl yq)
+DEPENDENCIES+=(
-REQUIRED_ENV+=()
+	kubectl
+)
+
+REQUIRED_ENV+=(
+	AWS_ACCOUNT
+	AWS_REGION
+)
 
 use cloud/aws/cli
 
 #####################################################################
 
-EKS__KUBECTL() { EKS kubectl $@; }
+EKS_CLUSTER_LOGIN() {
-EKS__FLUX()    { EKS flux $@; }
-
-#####################################################################
-
-EKS() {
-	local USAGE="
-		usage: cli [...kubectl args...]
-
-		args:
-		  cli   a kubectl-style CLI (e.g. kubectl, helm, flux, etc)
-
-		Allows access to kubernetes CLI commands by configuring environment
-		to point to a specific cluster.
-	"
-
-	REQUIRED_ENV=(AWS_REGION AWS_ACCOUNT CLUSTER_NAME) DEPENDENCIES=(kubectl $1) CHECK_ENVIRONMENT || return 1
-
-	local CONTEXT="arn:aws:eks:${AWS_REGION}:${AWS_ACCOUNT}:cluster/${CLUSTER_NAME}"
-
-	local CONTEXT_ARGS=()
-	case $1 in
-		helm ) CONTEXT_ARGS+=(--kube-context $CONTEXT) ;;
-		* ) CONTEXT_ARGS+=(--context $CONTEXT) ;;
-	esac
-
-	$1 ${CONTEXT_ARGS[@]} ${@:2}
-}
-
-#####################################################################
-
-EKS__CLUSTER_LOGIN() {
 	local USAGE="
 		usage:  [...options...]
 
@@ -50,7 +25,6 @@ EKS__CLUSTER_LOGIN() {
 		cluster in EKS. Also creates the kubeconfig entry if it does not
 		already exist.
 	"
-	REQUIRED_ENV=(AWS_ACCOUNT AWS_REGION) CHECK_ENVIRONMENT || return 1
 
 	local CLUSTER_NAME
 

zsh/lib/cloud/aws/eksctl.module.zsh

@@ -1,116 +0,0 @@
-#####################################################################
-
-DEPENDENCIES+=(eksctl)
-REQUIRED_ENV+=()
-
-use cloud/aws/eks
-
-#####################################################################
-
-EKSCTL() {
-	REQUIRED_ENV=(AWS_PROFILE AWS_REGION) CHECK_ENVIRONMENT || return 1
-
-	AWS_PROFILE=$AWS_PROFILE AWS_REGION=$AWS_REGION \
-		eksctl $@
-}
-
-EKSCTL__CREATE_IAMSERVICEACCOUNT() {
-	local USAGE="
-		usage: serviceaccount-name namespace [...options...] -- [...'eksctl create iamserviceaccount' args...]
-
-		options:
-		  --serviceaccount   (required) target k8s:ServiceAccount
-		  --namespace        (required) target k8s:Namespace
-		  --role-name        (required) name of the IAM role to assign
-
-		  --force   don't check for existing serviceaccount and override any existing configuration
-
-		eksctl create iamserviceaccount args:
-		$(eksctl create iamserviceaccount --help 2>&1 | grep -v -- '--name' | grep -v -- '--namespace' | grep -v -- '--role-name' | sed 's/^/  /')
-	"
-	REQUIRED_ENV=(AWS_REGION AWS_ACCOUNT CLUSTER_NAME) CHECK_ENVIRONMENT || return 1
-
-	local SERVICEACCOUNT NAMESPACE ROLE_NAME
-	local FORCE=0
-	local EKSCTL_ARGS=()
-
-	while [[ $# -gt 0 ]]
-	do
-		case $1 in
-			--serviceaccount ) SERVICEACCOUNT=$2; shift 1 ;;
-			--namespace      ) NAMESPACE=$2; shift 1 ;;
-			--role-name      ) ROLE_NAME=$2; shift 1 ;;
-
-			--force ) FORCE=1 ;; 
-
-			-- ) shift 1; break ;;
-
-			* ) ERROR "unknown argument '$1'" ;;
-		esac
-		shift 1
-	done
-
-	while [[ $# -gt 0 ]]; do EKSCTL_ARGS+=($1); shift 1; done
-
-	[ $SERVICEACCOUNT ] || ERROR "--serviceaccount is required"
-	[ $NAMESPACE      ] || ERROR "--namespace is required"
-	[ $ROLE_NAME      ] || ERROR "--role-name is required"
-
-	CHECK_ERRORS --no-fail || return 1
-
-	##########################################
-	
-	[[ $FORCE -eq 0 ]] && {
-		_EKS__CHECK_IAMSERVICEACCOUNT_EXISTS
-		local EXISTS_STATUS=$?
-		case $EXISTS_STATUS in
-			0 )
-				SUCCESS "'$NAMESPACE/$SERVICEACCOUNT' already configured with '$ROLE_NAME'"
-				return 0
-				;;
-			1 ) ;; # role does not exist yet; continue with rollout
-			2 )
-				ERROR "'$NAMESPACE/$SERVICEACCOUNT' has been configured with a different role than '$ROLE_NAME'"
-				REMINDER "must use --force flag to overwrite"
-				return 2
-				;;
-		esac
-	}
-
-	STATUS "creating iamserviceaccount" \
-		&& EKSCTL create iamserviceaccount \
-			--cluster $CLUSTER_NAME \
-			--namespace $NAMESPACE \
-			--name $SERVICEACCOUNT \
-			--role-name $ROLE_NAME \
-			--override-existing-serviceaccounts \
-			--approve \
-			${EKSCTL_ARGS[@]} \
-		&& SUCCESS "successfully configured '$NAMESPACE/$SERVICEACCOUNT' with IAM role '$ROLE_NAME'" \
-		|| { ERROR "unable to configure '$NAMESPACE/$SERVICEACCOUNT' with IAM role '$ROLE_NAME' (check cloudformation dashboard for details)"; return 3; }
-}
-
-_EKS__CHECK_IAMSERVICEACCOUNT_EXISTS() {
-	STATUS "checking for existing role-arn"
-	local CURRENT_ROLE_ARN=$(
-		EKS__KUBECTL --namespace $NAMESPACE get serviceaccount $SERVICEACCOUNT -o yaml \
-			| YQ -r '.metadata.annotations["eks.amazonaws.com/role-arn"]' \
-			| grep -v '^null$' \
-	)
-
-	[ $CURRENT_ROLE_ARN ] || {
-		STATUS "serviceaccount does not exist or has no configured role"
-		return 1
-	}
-
-	[[ $CURRENT_ROLE_ARN =~ "$ROLE_NAME$" ]] || {
-		STATUS "serviceaccount current role does not match desired role:
-			  CURRENT : $CURRENT_ROLE_ARN
-			  DESIRED : arn:aws:iam::${AWS_ACCOUNT}:role/$ROLE_NAME
-			  "
-		return 2
-	}
-
-	STATUS "serviceaccount current role matches desired role"
-	return 0
-}

zsh/lib/config.zsh

@@ -47,26 +47,6 @@ do
 	}
 done
 
-#####################################################################
-
-for GROUP_LOADER in $(env | sed -n 's/^SCWRYPTS_GROUP_LOADER__[a-z_]\+=//p')
-do
-	[ -f "$GROUP_LOADER" ] && source "$GROUP_LOADER"
-done
-
-: \
-	&& [ ! "$SCWRYPTS_AUTODETECT_GROUP_BASEDIR" ] \
-	&& [ $GITHUB_WORKSPACE ] \
-	&& [ ! $SCWRYPTS_GITHUB_NO_AUTOLOAD ] \
-	&& SCWRYPTS_AUTODETECT_GROUP_BASEDIR="$GITHUB_WORKSPACE"
-
-[ "$SCWRYPTS_AUTODETECT_GROUP_BASEDIR" ] && [ -d "$SCWRYPTS_AUTODETECT_GROUP_BASEDIR" ] && {
-	for GROUP_LOADER in $(find "$SCWRYPTS_AUTODETECT_GROUP_BASEDIR" -type f -name \*scwrypts.zsh)
-	do
-		[ -f "$GROUP_LOADER" ] && source "$GROUP_LOADER"
-	done
-}
-
 #####################################################################
 [ $NO_EXPORT_CONFIG ] || __SCWRYPT=1 # arbitrary; indicates currently inside a scwrypt
 true

zsh/lib/helm/template.module.zsh

@@ -4,7 +4,6 @@ DEPENDENCIES+=(helm kubeval)
 REQUIRED_ENV+=()
 
 use helm/validate
-use scwrypts
 
 #####################################################################
 
@@ -18,8 +17,6 @@ HELM__TEMPLATE__GET() {
 		  --colorize   use 'bat' to colorize output
 		  --raw        remove scwrypts-added fluff and only output helm template details
 
-		  -h, --help   show this help dialogue
-
 		Smart helm-template generator which auto-detects the chart
 		and sample values for testing and developing helm charts.
 	"
@@ -38,11 +35,8 @@ HELM__TEMPLATE__GET() {
 				;;
 
 			--raw ) RAW=1 ;;
-
-			-h | --help ) USAGE; return 0 ;;
 			-- ) shift 1; break ;;
 
-
 			* ) HELM_ARGS+=($1) ;;
 		esac
 		shift 1
@@ -66,7 +60,6 @@ HELM__TEMPLATE__GET() {
 		
 	[ ! $TEMPLATE_OUTPUT ] && EXIT_CODE=1
 
-
 	[[ $RAW -eq 1 ]] && {
 		[ $USE_CHART_ROOT ] && [[ $USE_CHART_ROOT -eq 1 ]] || HELM_ARGS+=(--show-only $(echo $TEMPLATE_FILENAME | sed "s|^$CHART_ROOT/||"))
 		[[ $COLORIZE -eq 1 ]] \

zsh/lib/helm/validate.module.zsh

@@ -27,20 +27,13 @@ HELM__VALIDATE() {
 		return 1
 	}
 
-	CHART_NAME=$(YQ -r .name "$CHART_ROOT/Chart.yaml")
+	CHART_NAME=$(yq -r .name "$CHART_ROOT/Chart.yaml")
 
-	[[ $TEMPLATE_FILENAME =~ values.*.yaml$ ]] && {
+	[[ $TEMPLATE_FILENAME =~ values*.yaml$ ]] && {
 		HELM_ARGS+=(--values $TEMPLATE_FILENAME)
 		USE_CHART_ROOT=1
 	}
 
-	[[ $TEMPLATE_FILENAME =~ tests/.*.yaml$ ]] && {
-		HELM_ARGS+=(--values $TEMPLATE_FILENAME)
-		USE_CHART_ROOT=1
-	}
-	[[ $TEMPLATE_FILENAME =~ .tpl$ ]] \
-		&& USE_CHART_ROOT=1
-
 	[[ $(dirname $TEMPLATE_FILENAME) =~ ^$CHART_ROOT$ ]] \
 		&& USE_CHART_ROOT=1
 	
@@ -62,34 +55,11 @@ _HELM__GET_CHART_ROOT() {
 
 _HELM__GET_DEFAULT_VALUES_ARGS() {
 	for F in \
-		"$CHART_ROOT/tests/default.yaml" \
-		"$CHART_ROOT/values.test.yaml" \
 		"$CHART_ROOT/values.yaml" \
+		"$CHART_ROOT/values.test.yaml" \
+		"$CHART_ROOT/tests/default.yaml" \
 		;
 	do
-		[ -f "$F" ] && HELM_ARGS=(--values "$F" $HELM_ARGS)
+		[ -f "$F" ] && HELM_ARGS+=(--values "$F")
-	done
-
-	for LOCAL_REPOSITORY in $(\
-		cat "$CHART_ROOT/Chart.yaml" \
-			| YQ -r '.dependencies[] | .repository' \
-			| grep '^file://' \
-			| sed 's|file://||' \
-		)
-	do
-		[[ $LOCAL_REPOSITORY =~ ^[/~] ]] \
-			&& LOCAL_REPOSITORY_ROOT="$LOCAL_REPOSITORY" \
-			|| LOCAL_REPOSITORY_ROOT="$CHART_ROOT/$LOCAL_REPOSITORY" \
-			;
-
-		for F in \
-			"$LOCAL_REPOSITORY_ROOT/tests/default.yaml" \
-			"$LOCAL_REPOSITORY_ROOT/values.test.yaml" \
-			"$LOCAL_REPOSITORY_ROOT/values.yaml" \
-			;
-		do
-			[ -f "$F" ] && HELM_ARGS=(--values "$F" $HELM_ARGS)
-		done
 	done
 }
-

zsh/lib/misc/tally.module.zsh

@@ -1,106 +0,0 @@
-#####################################################################
-
-DEPENDENCIES+=()
-REQUIRED_ENV+=()
-
-#####################################################################
-
-TALLY_USE_REDIS=false  # maybe someday
-TALLY_PATH="$SCWRYPTS_DATA_PATH/tally"
-
-#####################################################################
-
-TALLY() {
-	local USAGE="
-		usage: [...options...]
-
-		options:
-		  -c, --increment-count   increment the tally by this much (default 1)
-		  -n, --tally-name        name of tally system (default 'default')
-
-		  -g, --get     only output the current value
-		  -s, --set     set the tally to a specific value
-		  -r, --reset   set the tally back to zero
-
-		  --raw   only output the tally value
-
-		  -h, --help   print this dialogue and exit
-
-		Simple tally mark system; keep track of a count.
-	"
-
-	local INCREMENT_COUNT=1
-	local TALLY_NAME=default
-	local RAW=false
-
-	local SET_VALUE=
-
-	while [[ $# -gt 0 ]]
-	do
-		case $1 in
-			-c | --increment-count ) INCREMENT_COUNT=$2; shift 1 ;;
-			-n | --tally-name      ) TALLY_NAME=$2; shift 1 ;;
-
-			-g | --get   ) INCREMENT_COUNT=0 ;;
-
-			-s | --set   ) SET_VALUE=$2; shift 1 ;;
-			-r | --reset ) SET_VALUE=0 ;;
-
-			--raw ) RAW=true ;;
-
-			-h | --help ) USAGE; return 0 ;;
-
-			* ) ERROR "unknown argument '$1'" ;;
-		esac
-		shift 1
-	done
-
-	[ $TALLY_NAME ] && echo "$TALLY_NAME" | grep -qv '/' \
-		|| ERROR "invalid tally name '$TALLY_NAME'"
-
-	local TALLY_FILENAME="$TALLY_PATH/$TALLY_NAME.txt"
-
-	CHECK_ERRORS --no-fail || return 1
-
-	##########################################
-
-	local NEW_VALUE CURRENT_VALUE=0
-	[ $SET_VALUE ] && NEW_VALUE=$SET_VALUE || {
-		[ -f "$TALLY_FILENAME" ] && {
-			CURRENT_VALUE=$(cat "$TALLY_FILENAME" | tail -n1 | grep '^[0-9]\+')
-		}
-		
-		[ $CURRENT_VALUE ] || {
-			ERROR "malformed tally file '$TALLY_FILENAME'; aborting"
-			return 1
-		}
-
-		NEW_VALUE=$(($CURRENT_VALUE + $INCREMENT_COUNT))
-	}
-
-	##########################################
-
-	local TALLY_DIR="$(dirname "$TALLY_FILENAME")"
-
-	[ -d "$TALLY_DIR" ] || mkdir -p "$TALLY_DIR"
-	[ -d "$TALLY_DIR" ] || {
-		ERROR "unable to write to '$TALLY_DIR'; aborting"
-		return 1
-	}
-
-	echo "# autogenerated tally file; avoid direct modification\n$NEW_VALUE" > "$TALLY_FILENAME" || {
-		ERROR "failed to write to '$TALLY_FILENAME': aborting"
-		return 1
-	}
-
-	##########################################
-	
-	case $RAW in
-		true  ) printf "$NEW_VALUE" ;;
-		false )
-			case $TALLY_NAME in
-				default ) INFO "current tally : $NEW_VALUE" ;;
-				*       ) INFO "$TALLY_NAME : $NEW_VALUE" ;;
-			esac
-	esac
-}

zsh/lib/system/vim/vundle.module.zsh

@@ -20,7 +20,7 @@ VUNDLE__PLUGIN_LIST=$(ls $VUNDLE__PLUGIN_DIR | grep -v 'Vundle.vim' | grep -v 'b
 source $VUNDLE__BUILD_DEFINITIONS
 for PLUGIN in $(echo $VUNDLE__PLUGIN_LIST)
 do
-	which VUNDLE__BUILD__$PLUGIN >/dev/null 2>/dev/null || {
+	typeset -f VUNDLE__BUILD__$PLUGIN >/dev/null 2>/dev/null || {
 		echo -e "\nVUNDLE__BUILD__$PLUGIN() {\n	# ... build steps from $HOME/.vim/$PLUGIN \n}" \
 			>> $VUNDLE__BUILD_DEFINITIONS
 		VUNDLE__BUILD__$PLUGIN() {}

zsh/lib/utils/dependencies.zsh

@@ -17,13 +17,6 @@ __CHECK_DEPENDENCY() {
 		$E "application '$1' "$([[ $OPTIONAL -eq 1 ]] && echo preferred || echo required)" but not available on PATH $(__CREDITS $1)"
 		return 1
 	}
-
-	[[ $DEPENDENCY =~ ^yq$ ]] && {
-		yq --version | grep -q mikefarah \
-			|| WARNING 'detected kislyuk/yq but mikefarah/yq is preferred (compatibility may vary)'
-	}
-
-	return 0
 }
 
 __CHECK_COREUTILS() {
@@ -43,7 +36,7 @@ __CHECK_COREUTILS() {
 	done
 
 	[[ $NON_GNU_DEPENDENCY_COUNT -gt 0 ]] && {
-		WARNING 'scripts rely on GNU coreutils; compatibility may vary'
+		WARNING 'scripts rely on GNU coreutils; functionality may be limited'
 		IS_MACOS && REMINDER 'GNU coreutils can be installed and linked through Homebrew'
 	}
 

zsh/lib/utils/io.zsh

@@ -43,11 +43,11 @@ SUCCESS()  { PREFIX="SUCCESS  ✔" COLOR=$__GREEN  PRINT "$@"; }
 WARNING()  { PREFIX="WARNING  " COLOR=$__ORANGE PRINT "$@"; }
 STATUS()   { PREFIX="STATUS    " COLOR=$__BLUE   PRINT "$@"; }
 REMINDER() { PREFIX="REMINDER " COLOR=$__PURPLE PRINT "$@"; }
-INFO()     { PREFIX="INFO     ℹ" COLOR=$__WHITE  PRINT "$@"; }
+INFO()     { PREFIX="INFO     " COLOR=$__WHITE  PRINT "$@"; }
 
 PROMPT() {
 	PREFIX="PROMPT   " COLOR=$__CYAN PRINT "$@"
-	PREFIX="USER     ⌨" COLOR=$__CYAN PRINT '' --no-line-end
+	PREFIX="USER     " COLOR=$__CYAN PRINT '' --no-line-end
 }
 
 FAIL()  { ERROR "${@:2}"; exit $1; }
@@ -142,7 +142,6 @@ INPUT() {
 Yn() {
 	PROMPT "$@ [Yn]"
 	[ $CI ] && { echo y; return 0; }
-	[ $__SCWRYPTS_YES ] && [[ $__SCWRYPTS_YES -eq 1 ]] && { echo y; return 0; }
 
 	local Yn; READ -k Yn; echo >&2
 	[[ $Yn =~ [nN] ]] && return 1 || return 0
@@ -151,7 +150,6 @@ Yn() {
 yN() {
 	PROMPT "$@ [yN]"
 	[ $CI ] && { echo y; return 0; }
-	[ $__SCWRYPTS_YES ] && [[ $__SCWRYPTS_YES -eq 1 ]] && { echo y; return 0; }
 
 	local yN; READ -k yN; echo >&2
 	[[ $yN =~ [yY] ]] && return 0 || return 1
@@ -220,12 +218,3 @@ EDIT() {
 	$EDITOR $@ </dev/tty >/dev/tty
 	SUCCESS "finished editing '$1'!"
 }
-
-YQ() {
-	yq --version | grep -q mikefarah || {
-		yq $@
-		return $?
-	}
-
-	yq eval '... comments=""' | yq $@
-}

zsh/misc/tally

@@ -1,17 +0,0 @@
-#!/bin/zsh
-#####################################################################
-DEPENDENCIES+=()
-REQUIRED_ENV+=()
-
-use misc/tally
-
-CHECK_ENVIRONMENT
-#####################################################################
-
-MAIN() {
-	unset USAGE
-	TALLY $@
-}
-
-#####################################################################
-MAIN $@

zsh/system/vim/vundle/install

@@ -8,12 +8,7 @@ CHECK_ENVIRONMENT
 #####################################################################
 
 PLUGIN_INSTALL() {
-	[ -d "$HOME/.vim/bundle/Vundle.vim" ] || {
+	VUNDLE__PLUGIN_INSTALL || return 1
-		mkdir -p "$HOME/.vim/bundle/"
-		git clone https://github.com/VundleVim/Vundle.vim.git "$HOME/.vim/bundle/Vundle.vim"
-	}
-
-	VUNDLE__PLUGIN_INSTALL  || return 1
 	VUNDLE__REBUILD_PLUGINS || return 2
 }