Archives/TheLocehiliosan_yadm
1
0
Fork 0
mirror of https://github.com/TheLocehiliosan/yadm synced 2025-06-06 01:23:59 +00:00
Code Issues Releases Wiki Activity

Fix handling of filenames with space in bash completion (#341)

Browse Source 
By calling __gitcompappend with the same suffix as the completion for git
does (i.e. " ") we can remove the call to sort -u as it is no longer
needed (bash seems to remove duplicates) and then spaces are handled correctly.

Also make the completion available in testhost.
This commit is contained in:
Erik Flodin 2025-03-03 21:36:36 +01:00
parent bee1558a4e
commit 2ac90b004c
No known key found for this signature in database
GPG Key ID: 420A7C865EE3F85F
2 changed files with 29 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -123,6 +123,7 @@ testhost: require-docker .testyadm
--hostname testhost \ --hostname testhost \
--rm -it \ --rm -it \
-v "$(CURDIR)/.testyadm:/bin/yadm:ro" \ -v "$(CURDIR)/.testyadm:/bin/yadm:ro" \
-v "$(CURDIR)/completion/bash/yadm:/usr/share/bash-completion/completions/yadm:ro" \
$(IMAGE) \ $(IMAGE) \
bash -l bash -l

51
completion/bash/yadm
View File

@ -1,27 +1,26 @@
# test if git completion is missing, but loader exists, attempt to load # test if git completion is missing, but loader exists, attempt to load
if ! declare -F _git > /dev/null && ! declare -F __git_wrap__git_main > /dev/null; then if ! declare -F _git >/dev/null && ! declare -F __git_wrap__git_main >/dev/null; then
if declare -F _completion_loader > /dev/null; then if declare -F _completion_loader >/dev/null; then
_completion_loader git _completion_loader git
fi fi
fi fi
# only operate if git completion is present # only operate if git completion is present
if declare -F _git > /dev/null || declare -F __git_wrap__git_main > /dev/null; then if declare -F _git >/dev/null || declare -F __git_wrap__git_main >/dev/null; then
_yadm() { _yadm() {
local current=${COMP_WORDS[COMP_CWORD]} local current=${COMP_WORDS[COMP_CWORD]}
local penultimate local penultimate
if [ "$((COMP_CWORD-1))" -ge "0" ]; then if ((COMP_CWORD >= 1)); then
penultimate=${COMP_WORDS[COMP_CWORD-1]} penultimate=${COMP_WORDS[COMP_CWORD - 1]}
fi fi
local antepenultimate local antepenultimate
if [ "$((COMP_CWORD-2))" -ge "0" ]; then if ((COMP_CWORD >= 2)); then
antepenultimate=${COMP_WORDS[COMP_CWORD-2]} antepenultimate=${COMP_WORDS[COMP_CWORD - 2]}
fi fi
local -x GIT_DIR local -x GIT_DIR
# shellcheck disable=SC2034
GIT_DIR="$(yadm introspect repo 2>/dev/null)" GIT_DIR="$(yadm introspect repo 2>/dev/null)"
case "$penultimate" in case "$penultimate" in
@ -30,19 +29,19 @@ if declare -F _git > /dev/null || declare -F __git_wrap__git_main > /dev/null; t
return 0 return 0
;; ;;
config) config)
COMPREPLY=( $(compgen -W "$(yadm introspect configs 2>/dev/null)") ) COMPREPLY=($(compgen -W "$(yadm introspect configs 2>/dev/null)"))
return 0 return 0
;; ;;
decrypt) decrypt)
COMPREPLY=( $(compgen -W "-l" -- "$current") ) COMPREPLY=($(compgen -W "-l" -- "$current"))
return 0 return 0
;; ;;
init) init)
COMPREPLY=( $(compgen -W "-f -w" -- "$current") ) COMPREPLY=($(compgen -W "-f -w" -- "$current"))
return 0 return 0
;; ;;
introspect) introspect)
COMPREPLY=( $(compgen -W "commands configs repo switches" -- "$current") ) COMPREPLY=($(compgen -W "commands configs repo switches" -- "$current"))
return 0 return 0
;; ;;
help) help)
@ -50,39 +49,37 @@ if declare -F _git > /dev/null || declare -F __git_wrap__git_main > /dev/null; t
return 0 return 0
;; ;;
list) list)
COMPREPLY=( $(compgen -W "-a" -- "$current") ) COMPREPLY=($(compgen -W "-a" -- "$current"))
return 0 return 0
;; ;;
esac esac
case "$antepenultimate" in case "$antepenultimate" in
clone) clone)
COMPREPLY=( $(compgen -W "-f -w -b --bootstrap --no-bootstrap" -- "$current") ) COMPREPLY=($(compgen -W "-f -w -b --bootstrap --no-bootstrap" -- "$current"))
return 0 return 0
;; ;;
esac esac
local yadm_switches=( $(yadm introspect switches 2>/dev/null) ) local yadm_switches=($(yadm introspect switches 2>/dev/null))
# this condition is so files are completed properly for --yadm-xxx options # this condition is so files are completed properly for --yadm-xxx options
if [[ " ${yadm_switches[*]} " != *" $penultimate "* ]]; then if [[ " ${yadm_switches[*]} " != *" $penultimate "* ]]; then
# TODO: somehow solve the problem with [--yadm-xxx option] being # TODO: somehow solve the problem with [--yadm-xxx option] being
# incompatible with what git expects, namely [--arg=option] # incompatible with what git expects, namely [--arg=option]
if declare -F _git > /dev/null; then if declare -F _git >/dev/null; then
_git _git
else else
__git_wrap__git_main __git_wrap__git_main
fi fi
fi fi
if [[ "$current" =~ ^- ]]; then if [[ "$current" =~ ^- ]]; then
local matching __gitcompappend "${yadm_switches[*]}" "" "$current" " "
matching=$(compgen -W "${yadm_switches[*]}" -- "$current")
__gitcompappend "$matching"
fi fi
# Find the index of where the sub-command argument should go. # Find the index of where the sub-command argument should go.
local command_idx local command_idx
for (( command_idx=1 ; command_idx < ${#COMP_WORDS[@]} ; command_idx++ )); do for ((command_idx = 1; command_idx < ${#COMP_WORDS[@]}; command_idx++)); do
local command_idx_arg="${COMP_WORDS[$command_idx]}" local command_idx_arg="${COMP_WORDS[$command_idx]}"
if [[ " ${yadm_switches[*]} " = *" $command_idx_arg "* ]]; then if [[ " ${yadm_switches[*]} " = *" $command_idx_arg "* ]]; then
let command_idx++ let command_idx++
@ -93,19 +90,11 @@ if declare -F _git > /dev/null || declare -F __git_wrap__git_main > /dev/null; t
fi fi
done done
if [[ "$COMP_CWORD" = "$command_idx" ]]; then if [[ "$COMP_CWORD" = "$command_idx" ]]; then
local matching __gitcompappend "$(yadm introspect commands 2>/dev/null)" "" "$current" " "
matching=$(compgen -W "$(yadm introspect commands 2>/dev/null)" -- "$current")
__gitcompappend "$matching"
fi fi
# remove duplicates found in COMPREPLY (a native bash way could be better)
if [ -n "${COMPREPLY[*]}" ]; then
COMPREPLY=($(echo "${COMPREPLY[@]}" | sort -u))
fi
} }
complete -o bashdefault -o default -F _yadm yadm 2>/dev/null \ complete -o bashdefault -o default -o nospace -F _yadm yadm 2>/dev/null ||
|| complete -o default -F _yadm yadm complete -o default -o nospace -F _yadm yadm
fi fi