Use more specific names for global variables in Bash and ZSH completions

This commit is contained in:
2024-07-16 18:35:31 -04:00
parent f7555f35ec
commit 5d32636816
3 changed files with 16 additions and 16 deletions
+4 -4
View File
@@ -1,4 +1,4 @@
mutn /mutn
mutn.exe /mutn.exe
libmuttonserver /libmuttonserver
libmuttonserver.exe /libmuttonserver.exe
+5 -5
View File
@@ -1,16 +1,16 @@
# mutn(1) completion # mutn(1) completion
_path_gen() { _path_gen() {
local mutnPath="$HOME/.local/share/libmutton" local entryRoot="$HOME/.local/share/libmutton"
local globStatus=$(shopt -p globstar) local globStatus=$(shopt -p globstar)
[ -z "${globStatus##*u*}" ] && shopt -s globstar # if recursive globbing is disabled, enable it [ -z "${globStatus##*u*}" ] && shopt -s globstar # if recursive globbing is disabled, enable it
local fullPaths=("$mutnPath"/**/*) local fullPaths=("$entryRoot"/**/*)
$globStatus # set recursive globbing to user default $globStatus # set recursive globbing to user default
for scanPath in "${fullPaths[@]}"; do for scanPath in "${fullPaths[@]}"; do
# exclude directories # exclude directories
[ -f "$scanPath" ] && trimmedPaths+=("${scanPath#$mutnPath}") [ -f "$scanPath" ] && libmuttonTrimmedPaths+=("${scanPath#$entryRoot}")
done done
if [ "${trimmedPaths[0]}" == '' ]; then trimmedPaths[0]=help; fi if [ "${libmuttonTrimmedPaths[0]}" == '' ]; then libmuttonTrimmedPaths[0]=help; fi
} && } &&
_mutnCompletions() { _mutnCompletions() {
@@ -19,7 +19,7 @@ _mutnCompletions() {
case $prev in case $prev in
mutn ) mutn )
while read -r; do ITEM=${REPLY// /\\ }; COMPREPLY+=( "$ITEM" ); done < <( compgen -W "$(printf "'%s' " "${trimmedPaths[@]}")" -- "$cur" ) while read -r; do ITEM=${REPLY// /\\ }; COMPREPLY+=( "$ITEM" ); done < <( compgen -W "$(printf "'%s' " "${libmuttonTrimmedPaths[@]}")" -- "$cur" )
;; ;;
/* ) /* )
while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -W "copy edit gen add shear" -- "$cur" ) while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -W "copy edit gen add shear" -- "$cur" )
+7 -7
View File
@@ -1,17 +1,17 @@
#compdef mutn #compdef mutn
mutnPath="$HOME/.local/share/libmutton" libmuttonEntryRoot="$HOME/.local/share/libmutton"
fullPaths=("$mutnPath"/**/*) libmuttonFullPaths=("$libmuttonEntryRoot"/**/*)
trimmedPaths=() libmuttonTrimmedPaths=()
for scanPath in "${fullPaths[@]}"; do for scanPath in "${libmuttonFullPaths[@]}"; do
# exclude directories # exclude directories
[ -f "$scanPath" ] && trimmedPaths+=("${scanPath#$mutnPath}") [ -f "$scanPath" ] && libmuttonTrimmedPaths+=("${scanPath#$libmuttonEntryRoot}")
done done
[[ -z $trimmedPaths ]] && trimmedPaths=(help) [[ -z $libmuttonTrimmedPaths ]] && libmuttonTrimmedPaths=(help)
case ${words[-2]} in case ${words[-2]} in
mutn ) mutn )
compadd $trimmedPaths compadd $libmuttonTrimmedPaths
;; ;;
/* ) /* )
compadd {copy,edit,gen,add,shear} compadd {copy,edit,gen,add,shear}