From fdac46d68a277ad8d9e1a7312ae4526c1e7f2d05 Mon Sep 17 00:00:00 2001 From: Vladimir Zhelezov Date: Tue, 15 Dec 2020 08:38:21 +0100 Subject: [PATCH] Fix _hledger_extension_completion when called by path... Could break if called with ./funky-path/with-dashes/hledger-ui --- shell-completion/hledger-completion.bash | 8 +++++--- shell-completion/hledger-completion.bash.m4 | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/shell-completion/hledger-completion.bash b/shell-completion/hledger-completion.bash index 3f34bd8ba..c61cb9e42 100644 --- a/shell-completion/hledger-completion.bash +++ b/shell-completion/hledger-completion.bash @@ -117,9 +117,11 @@ _hledger_completion_function() { } _hledger_extension_completion_function() { - # Pretend that hledger is called with given extension - # as first argument and call main completion function - COMP_WORDS=("hledger" "${1#*-}" "${COMP_WORDS[@]:1}") + local cmd=${1##*/} + local ext=${cmd#hledger-} + # Pretend that hledger is called with the given extension + # as the first argument and call main completion function + COMP_WORDS=("hledger" "$ext" "${COMP_WORDS[@]:1}") COMP_CWORD=$((COMP_CWORD + 1)) _hledger_completion_function "hledger" "${@:1}" } diff --git a/shell-completion/hledger-completion.bash.m4 b/shell-completion/hledger-completion.bash.m4 index 9c7785848..296dcf5b1 100644 --- a/shell-completion/hledger-completion.bash.m4 +++ b/shell-completion/hledger-completion.bash.m4 @@ -117,9 +117,11 @@ _hledger_completion_function() { } _hledger_extension_completion_function() { - # Pretend that hledger is called with given extension - # as first argument and call main completion function - COMP_WORDS=("hledger" "${1#*-}" "${COMP_WORDS[@]:1}") + local cmd=${1##*/} + local ext=${cmd#hledger-} + # Pretend that hledger is called with the given extension + # as the first argument and call main completion function + COMP_WORDS=("hledger" "$ext" "${COMP_WORDS[@]:1}") COMP_CWORD=$((COMP_CWORD + 1)) _hledger_completion_function "hledger" "${@:1}" }