From 6fba67df1928a62abc7939bd8ff020e998ad8d6b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 3 Oct 2021 13:15:56 +0200 Subject: bash completion: Consolidate similar $command ‘if’ branches. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * etc/completion/bash/guix (_guix_complete): Combine the ‘upgrade’ and ‘remove’ commands, as well as ‘download’, ‘gc’, and ‘hash’. --- etc/completion/bash/guix | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'etc/completion/bash') diff --git a/etc/completion/bash/guix b/etc/completion/bash/guix index a9386e7794..112ea789de 100644 --- a/etc/completion/bash/guix +++ b/etc/completion/bash/guix @@ -237,15 +237,7 @@ _guix_complete () else _guix_complete_available_package "$word_at_point" fi - elif [[ "$command" = "remove" ]] - then - if _guix_is_dash_L || _guix_is_dash_m || _guix_is_dash_p - then - _guix_complete_file - else - _guix_complete_installed_package "$word_at_point" - fi - elif [[ "$command" = "upgrade" ]] + elif [[ "$command" = "upgrade" || "$command" = "remove" ]] then if _guix_is_dash_L || _guix_is_dash_m || _guix_is_dash_p then @@ -272,9 +264,9 @@ _guix_complete () else _guix_complete_available_package "$word_at_point" fi - elif [[ "$command" = "download" ]] + elif [[ "$command" = "download" || "$command" = "gc" || "$command" = "hash" ]] then - _guix_complete_file + _guix_complete_file elif [[ "$command" = "system" ]] then case $COMP_CWORD in @@ -305,9 +297,6 @@ _guix_complete () elif [[ "$command" = "import" ]] then _guix_complete_subcommand - elif [[ "$command" = "hash" || "$command" = "gc" ]] - then - _guix_complete_file elif [[ "$command" = "weather" ]] then if _guix_is_dash_m -- cgit 1.4.1