From a2a735ce8fc475fdc6131d8462634f77a13e9309 Mon Sep 17 00:00:00 2001 From: martinml <217925+martinml@users.noreply.github.com> Date: Sat, 4 May 2024 11:27:45 +0200 Subject: [PATCH 1/2] Only use `nosort` in bash <4.4 --- etc/completion/completion.bash | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/etc/completion/completion.bash b/etc/completion/completion.bash index 5c7de994c..88e2a49d1 100644 --- a/etc/completion/completion.bash +++ b/etc/completion/completion.bash @@ -375,4 +375,9 @@ _delta() { esac } -complete -F _delta -o nosort -o bashdefault -o default delta +# nosort isn't supported for bash less than < 4.4 +if [[ ${BASH_VERSINFO[0]} -lt 4 || ( ${BASH_VERSINFO[0]} -eq 4 && ${BASH_VERSINFO[1]} -lt 4 ) ]]; then + complete -F _delta -o bashdefault -o default delta +else + complete -F _delta -o bashdefault -o default delta -o nosort +fi From 1c5af17fa46d2a102af3238c328544f72a833cf4 Mon Sep 17 00:00:00 2001 From: martinml <217925+martinml@users.noreply.github.com> Date: Wed, 8 May 2024 15:07:27 +0200 Subject: [PATCH 2/2] Fix bad parameter order --- etc/completion/completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/completion/completion.bash b/etc/completion/completion.bash index 88e2a49d1..124f73c35 100644 --- a/etc/completion/completion.bash +++ b/etc/completion/completion.bash @@ -379,5 +379,5 @@ _delta() { if [[ ${BASH_VERSINFO[0]} -lt 4 || ( ${BASH_VERSINFO[0]} -eq 4 && ${BASH_VERSINFO[1]} -lt 4 ) ]]; then complete -F _delta -o bashdefault -o default delta else - complete -F _delta -o bashdefault -o default delta -o nosort + complete -F _delta -o bashdefault -o default -o nosort delta fi