lockbox

commit 35fc5fbab9c133e3cf66b11cd631ae8d49a638fc
parent 9e839dd93ba81edf8dd75436b10dc901cc20f1bc
Author: Sean Enck <sean@ttypty.com>
Date:   Fri, 22 Mar 2024 18:55:36 -0400

fix fish completion for help and totp subcommands

Diffstat:
M
internal/app/doc/fish.sh
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/internal/app/doc/fish.sh b/internal/app/doc/fish.sh
@@ -5,7 +5,7 @@ complete -c {{ $.Executable }} -f
 function {{ $profile.Name }}
   set -l commands {{ range $idx, $value := $profile.Options }}{{ if gt $idx 0}} {{ end }}{{ $value }}{{ end }}
   complete -c {{ $.Executable }} -n "not __fish_seen_subcommand_from $commands" -a "$commands"
-  complete -c {{ $.Executable }} -n "__fish_seen_subcommand_from {{ $.HelpCommand }}" -a "{{ $.HelpAdvancedCommand }}"
+  complete -c {{ $.Executable }} -n "__fish_seen_subcommand_from {{ $.HelpCommand }}; and test (count (commandline -opc)) -lt 3" -a "{{ $.HelpAdvancedCommand }}"
 {{- if not $profile.ReadOnly }}
 {{- if $profile.CanList }}
   complete -c {{ $.Executable }} -n "__fish_seen_subcommand_from {{ $.InsertCommand }} {{ $.MultiLineCommand }} {{ $.RemoveCommand }}; and test (count (commandline -opc)) -lt 3" -a "({{ $.DoList }})"
@@ -14,7 +14,7 @@ function {{ $profile.Name }}
 {{- end}}
 {{- if $profile.CanTOTP }}
   set -l totps {{ $.TOTPListCommand }}{{ range $key, $value := .TOTPSubCommands }} {{ $value }}{{ end }}
-  complete -c {{ $.Executable }} -n "__fish_seen_subcommand_from {{ $.TOTPCommand }}" -a "$totps"
+  complete -c {{ $.Executable }} -n "__fish_seen_subcommand_from {{ $.TOTPCommand }}; and not __fish_seen_subcommand_from $totps" -a "$totps"
 {{- if $profile.CanList }}
   complete -c {{ $.Executable }} -n "__fish_seen_subcommand_from {{ $.TOTPCommand }}; and __fish_seen_subcommand_from $totps" -a "({{ $.DoTOTPList }})"
 {{- end}}