diff --git a/.gitignore b/.gitignore index 89512f9..39db666 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -mutn -mutn.exe -libmuttonserver -libmuttonserver.exe +/mutn +/mutn.exe +/libmuttonserver +/libmuttonserver.exe diff --git a/completions/bash/mutn b/completions/bash/mutn index 42fe1ae..e57f60a 100644 --- a/completions/bash/mutn +++ b/completions/bash/mutn @@ -1,16 +1,16 @@ # mutn(1) completion _path_gen() { - local mutnPath="$HOME/.local/share/libmutton" + local entryRoot="$HOME/.local/share/libmutton" local globStatus=$(shopt -p globstar) [ -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 for scanPath in "${fullPaths[@]}"; do # exclude directories - [ -f "$scanPath" ] && trimmedPaths+=("${scanPath#$mutnPath}") + [ -f "$scanPath" ] && libmuttonTrimmedPaths+=("${scanPath#$entryRoot}") done - if [ "${trimmedPaths[0]}" == '' ]; then trimmedPaths[0]=help; fi + if [ "${libmuttonTrimmedPaths[0]}" == '' ]; then libmuttonTrimmedPaths[0]=help; fi } && _mutnCompletions() { @@ -19,7 +19,7 @@ _mutnCompletions() { case $prev in 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" ) diff --git a/completions/zsh/_mutn b/completions/zsh/_mutn index 3746049..50ec02a 100644 --- a/completions/zsh/_mutn +++ b/completions/zsh/_mutn @@ -1,17 +1,17 @@ #compdef mutn -mutnPath="$HOME/.local/share/libmutton" -fullPaths=("$mutnPath"/**/*) -trimmedPaths=() -for scanPath in "${fullPaths[@]}"; do +libmuttonEntryRoot="$HOME/.local/share/libmutton" +libmuttonFullPaths=("$libmuttonEntryRoot"/**/*) +libmuttonTrimmedPaths=() +for scanPath in "${libmuttonFullPaths[@]}"; do # exclude directories - [ -f "$scanPath" ] && trimmedPaths+=("${scanPath#$mutnPath}") + [ -f "$scanPath" ] && libmuttonTrimmedPaths+=("${scanPath#$libmuttonEntryRoot}") done -[[ -z $trimmedPaths ]] && trimmedPaths=(help) +[[ -z $libmuttonTrimmedPaths ]] && libmuttonTrimmedPaths=(help) case ${words[-2]} in mutn ) - compadd $trimmedPaths + compadd $libmuttonTrimmedPaths ;; /* ) compadd {copy,edit,gen,add,shear}