bash completion: Fix ‘system’ & ‘container’ subcommands.

* etc/completion/bash/guix (_guix_complete): Count words from the
innermost command.

1 files changed, 5 insertions, 5 deletions

diff --git a/etc/completion/bash/guix b/etc/completion/bash/guix
index d5ec427e0c5..87d9911e53a 100644
--- a/etc/completion/bash/guix
+++ b/etc/completion/bash/guix
@@ -284,8 +284,8 @@ _guix_complete ()
                 _guix_complete_available_package_or_store_file "$word_at_point"
             elif [[ "$command" = "system" ]]
             then
-                case $COMP_CWORD in
-                    2) _guix_complete_subcommand;;
+                case $((COMP_CWORD - command_index)) in
+                    1) _guix_complete_subcommand;;
                     *) _guix_complete_file;; # TODO: restrict to *.scm
                 esac
             elif [[ "$command" = "pull" ]]
@@ -304,9 +304,9 @@ _guix_complete ()
                 fi
             elif [[ "$command" = "container" ]]
             then
-                case $COMP_CWORD in
-                    2) _guix_complete_subcommand;;
-                    3) _guix_complete_pid "$word_at_point";;
+                case $((COMP_CWORD - command_index)) in
+                    1) _guix_complete_subcommand;;
+                    2) _guix_complete_pid "$word_at_point";;
                     *) _guix_complete_file;;
                 esac
             elif [[ "$command" = "import" ]]