From 1c3403825c1ea0fee0a6574b657a9561a2d73246 Mon Sep 17 00:00:00 2001 From: Johannes Altmanninger Date: Sun, 4 Jan 2026 09:14:23 +0100 Subject: [PATCH] completions/signify: consistent style Also, replace use of "ls" with globbing. --- share/completions/signify.fish | 103 +++++++++++++++++---------------- 1 file changed, 53 insertions(+), 50 deletions(-) diff --git a/share/completions/signify.fish b/share/completions/signify.fish index fd1448635..a8fb9d30c 100644 --- a/share/completions/signify.fish +++ b/share/completions/signify.fish @@ -8,68 +8,71 @@ set -l subcommands_desc (echo -s \ -V\t"Verify the message and signature match."\n \ | string escape) -complete -c signify --no-files +complete -c signify -f complete -c signify \ - --condition "not __fish_seen_subcommand_from $subcommands" \ - --arguments "$subcommands_desc" + -n "not __fish_seen_subcommand_from $subcommands" \ + -a "$subcommands_desc" -complete -c signify --force-files \ - --condition '__fish_seen_subcommand_from -C' +complete -c signify -F \ + -n '__fish_seen_subcommand_from -C' -complete -c signify --short-option c --no-files --require-parameter \ - --description 'Specify the comment to be added during key generation' \ - --condition '__fish_seen_subcommand_from -G' +complete -c signify -s c -f -r \ + -d 'Specify the comment to be added during key generation' \ + -n '__fish_seen_subcommand_from -G' -complete -c signify --short-option e --no-files \ - --description 'Use embedded signatures' \ - --condition '__fish_seen_subcommand_from -S -V' +complete -c signify -s e -f \ + -d 'Use embedded signatures' \ + -n '__fish_seen_subcommand_from -S -V' -complete -c signify --short-option m --force-files --require-parameter \ - --description 'Message file to sign or verify' \ - --condition '__fish_seen_subcommand_from -S -V' +complete -c signify -s m -F -r \ + -d 'Message file to sign or verify' \ + -n '__fish_seen_subcommand_from -S -V' # The -n option has two context-dependent meanings -complete -c signify --short-option n --no-files \ - --description 'When generating a key pair, do not ask for a passphrase' \ - --condition '__fish_seen_argument -s G' -complete -c signify --short-option n --no-files \ - --description 'When signing with -z, store a zero timestamp in the gzip header' \ - --condition '__fish_seen_subcommand_from -S && __fish_seen_argument -s z' +complete -c signify -s n -f \ + -d 'When generating a key pair, do not ask for a passphrase' \ + -n '__fish_seen_argument -s G' +complete -c signify -s n -f \ + -d 'When signing with -z, store a zero timestamp in the gzip header' \ + -n '__fish_seen_subcommand_from -S && __fish_seen_argument -s z' # This is deliberately split up to only add a description to the flag and not all its argument completions -complete -c signify --short-option p --no-files --keep-order --require-parameter \ - --arguments '(__fish_complete_suffix .pub)' \ - --condition '__fish_seen_subcommand_from -C -G -V' -complete -c signify --short-option p --no-files --keep-order --require-parameter \ - --description 'Public key produced by -G, and used by -V to check a signature' \ - --condition '__fish_seen_subcommand_from -C -G -V' +complete -c signify -s p -f -k -r \ + -a '(__fish_complete_suffix .pub)' \ + -n '__fish_seen_subcommand_from -C -G -V' +complete -c signify -s p -f -k -r \ + -d 'Public key produced by -G, and used by -V to check a signature' \ + -n '__fish_seen_subcommand_from -C -G -V' -complete -c signify --short-option q --no-files \ - --description 'Quiet mode. Suppress informational output' \ - --condition '__fish_seen_subcommand_from -C -V' +complete -c signify -s q -f \ + -d 'Quiet mode. Suppress informational output' \ + -n '__fish_seen_subcommand_from -C -V' -complete -c signify --short-option s --no-files --keep-order --require-parameter \ - --arguments '(__fish_complete_suffix .sec)' \ - --condition '__fish_seen_subcommand_from -G -S' -complete -c signify --short-option s --no-files --keep-order --require-parameter \ - --description 'Secret (private) key produced by -G, and used by -S to sign a message' \ - --condition '__fish_seen_subcommand_from -G -S' +complete -c signify -s s -f -k -r \ + -a '(__fish_complete_suffix .sec)' \ + -n '__fish_seen_subcommand_from -G -S' +complete -c signify -s s -f -k -r \ + -d 'Secret (private) key produced by -G, and used by -S to sign a message' \ + -n '__fish_seen_subcommand_from -G -S' -complete -c signify --short-option t --no-files --require-parameter \ - --arguments '(ls /etc/signify 2>/dev/null | string match -e \'*-*.pub\' | string replace -r \'\\.pub$\' "" | string replace -r \'.*-\' "")' \ - --condition '__fish_seen_subcommand_from -C -V' -complete -c signify --short-option t --no-files --require-parameter \ - --description 'When inferring a key to verify with, only use keys with this keytype suffix' \ - --condition '__fish_seen_subcommand_from -C -V' +complete -c signify -s t -f -r \ + -a '( + set -l files /etc/signify/* + string replace -rf -- \'\\.pub$\' "" $files | string replace -r \'.*-\' "" + )' \ + -n '__fish_seen_subcommand_from -C -V' +complete -c signify -s t -f -r \ + -d 'When inferring a key to verify with, only use keys with this keytype suffix' \ + -n '__fish_seen_subcommand_from -C -V' -complete -c signify --short-option x --no-files --keep-order --require-parameter \ - --arguments '(__fish_complete_suffix .sig)' \ - --condition '__fish_seen_subcommand_from -C -S -V' -complete -c signify --short-option x --no-files --keep-order --require-parameter \ - --description 'The signature file to create or verify. The default is message.sig' \ - --condition '__fish_seen_subcommand_from -C -S -V' +complete -c signify -s x -f -k -r \ + -a '(__fish_complete_suffix .sig)' \ + -n '__fish_seen_subcommand_from -C -S -V' +complete -c signify -s x -f -k -r \ + -d 'The signature file to create or verify. The default is message.sig' \ + -n '__fish_seen_subcommand_from -C -S -V' -complete -c signify --short-option z --no-files \ - --description 'Sign and verify gzip (1) archives, embed signature in the header' \ - --condition '__fish_seen_subcommand_from -S -V' +complete -c signify -s z -f \ + -d 'Sign and verify gzip (1) archives, embed signature in the header' \ + -n '__fish_seen_subcommand_from -S -V'