Fix openssl completions for LibreSSL

Fixes #7966
This commit is contained in:
ridiculousfish 2021-05-05 14:42:36 -07:00
parent f25b9f9831
commit 3f35012afb

View file

@ -1,11 +1,15 @@
function __fish_openssl_subcommand_options --description "Print options for openssl subcommand"
set -l cmd (commandline -poc)
openssl list -options $cmd[2] | string replace -r -- '^(\S*)\s*.*' '-$1'
end
if command openssl list -1 2>&1 >/dev/null
if string match -q "OpenSSL*" (command openssl version)
# This is real OpenSSL that has the list command.
function __fish_openssl_subcommand_options --description "Print options for openssl subcommand"
set -l cmd (commandline -poc)
openssl list -options $cmd[2] | string replace -r -- '^(\S*)\s*.*' '-$1'
end
complete -c openssl -n __fish_use_subcommand -x -a "(openssl list -1 -commands -cipher-commands -digest-commands)"
complete -c openssl -n 'not __fish_use_subcommand && string match -qr -- "^-" (commandline -ct)' -a "(__fish_openssl_subcommand_options)"
else
complete -c openssl -n __fish_use_subcommand -x -a "(openssl help 2>&1 | string match -rv '^[A-Z]|^\$' | string split -n ' ')"
# Perhaps LibreSSL - see #7966
# TODO: support subcommand options.
complete -c openssl -n __fish_use_subcommand -x -a "(openssl help 2>&1 | string match -rv '^[A-Z]|^\$|Error' | string split -n ' ')"
end
complete -c openssl -n 'not __fish_use_subcommand && string match -qr -- "^-" (commandline -ct)' -a "(__fish_openssl_subcommand_options)"