[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/13: bash completion: Complete top-level options.
From: |
guix-commits |
Subject: |
09/13: bash completion: Complete top-level options. |
Date: |
Sat, 30 Oct 2021 18:58:34 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit 8e6989fcaf4a6de00e799777e2a0ccb90fc05e59
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sat Oct 30 16:37:25 2021 +0200
bash completion: Complete top-level options.
* etc/completion/bash/guix (_guix_complete_option): Fix operation without a
{,sub}command.
(_guix_complete): Call it also when no command is given.
---
etc/completion/bash/guix | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/etc/completion/bash/guix b/etc/completion/bash/guix
index 5d1ae37..6a11e1b 100644
--- a/etc/completion/bash/guix
+++ b/etc/completion/bash/guix
@@ -72,10 +72,16 @@ _guix_complete_option ()
{
local command="${COMP_WORDS[$1]}"
local subcommand="${COMP_WORDS[$(($1 + 1))]}"
- if _guix_is_option "$subcommand"
+
+ if [ $1 -le 1 ]
+ then
+ command=""
+ subcommand=""
+ elif _guix_is_option "$subcommand"
then
subcommand=""
fi
+
local options="$(${COMP_WORDS[0]} $command $subcommand --help 2> /dev/null
\
| grep '^ \+-' \
| sed
-e's/^.*--\([a-zA-Z0-9_-]\+\)\(=\?\).*/--\1\2/g')"
@@ -229,6 +235,7 @@ _guix_complete ()
case $COMP_CWORD in
$command_index)
_guix_complete_command
+ _guix_complete_option 0 "$word_at_point"
;;
*)
if [[ "$command" = "package" ]]
- 01/13: gnu: bsequencer: Update to 1.8.10., (continued)
- 01/13: gnu: bsequencer: Update to 1.8.10., guix-commits, 2021/10/30
- 02/13: gnu: bchoppr: Update to 1.10.10., guix-commits, 2021/10/30
- 03/13: gnu: bshapr: Update to 0.13., guix-commits, 2021/10/30
- 04/13: gnu: bjumblr: Update to 1.6.8., guix-commits, 2021/10/30
- 06/13: ui: Add top-level options to help text., guix-commits, 2021/10/30
- 07/13: ui: Use DISPLAY in SHOW-GUIX-HELP., guix-commits, 2021/10/30
- 08/13: bash completion: Don't hard-code "guix" binary name., guix-commits, 2021/10/30
- 12/13: gnu: remmina: Update to 1.4.21., guix-commits, 2021/10/30
- 13/13: gnu: dconf: Increase test timeout further., guix-commits, 2021/10/30
- 05/13: gnu: bschaffl: Update to 1.4.8., guix-commits, 2021/10/30
- 09/13: bash completion: Complete top-level options.,
guix-commits <=
- 10/13: gnu: polybar: Update to 3.5.7., guix-commits, 2021/10/30
- 11/13: gnu: aws-c-mqtt: Update to 0.7.8., guix-commits, 2021/10/30