aboutsummaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorMathieu Othacehe <othacehe@gnu.org>2021-12-10 21:49:25 +0100
committerMathieu Othacehe <othacehe@gnu.org>2021-12-10 21:49:25 +0100
commit32750e8c3ed38df4cafb39cffa878c6851abc899 (patch)
treedcf40b321c3b492bd1d00244c78f72160e66a554 /etc
parent6104071e483095f9fea9700e0317e84f64102ae2 (diff)
parente1e32303129c5aedc7236d5cc854d6b72ad35daf (diff)
downloadguix-32750e8c3ed38df4cafb39cffa878c6851abc899.tar
guix-32750e8c3ed38df4cafb39cffa878c6851abc899.tar.gz
Merge remote-tracking branch 'signed/master' into core-updates
Diffstat (limited to 'etc')
-rw-r--r--etc/completion/bash/guix10
1 files changed, 7 insertions, 3 deletions
diff --git a/etc/completion/bash/guix b/etc/completion/bash/guix
index 6a11e1b23b..f262d4d95a 100644
--- a/etc/completion/bash/guix
+++ b/etc/completion/bash/guix
@@ -275,9 +275,13 @@ _guix_complete ()
fi
elif [[ "$command" = "environment" || "$command" = "shell" ]]
then
- if _guix_is_dash_L || _guix_is_dash_m || _guix_is_dash_p || _guix_is_dash_l
- then
- _guix_complete_file
+ if _guix_is_dash_f && [[ "$command" = "shell" ]]
+ then
+ # The otherwise identical ‘guix environment’ lacks the ‘-f’ option.
+ _guix_complete_file
+ elif _guix_is_dash_L || _guix_is_dash_m || _guix_is_dash_p || _guix_is_dash_l
+ then
+ _guix_complete_file
elif _guix_is_option "$word_at_point"
then
_guix_complete_option "$command_index" "$word_at_point"