From ee303e4a94c36ff996fe322de39b62ee226fe7a7 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 21 May 2019 16:31:46 +0930 Subject: [PATCH] contrib: fix up bash completion script. $ lightning-cli autocleaninvoice dev-slowcmd listinvoices check dev-suppress-gossip listnodes close disconnect listpayments connect feerates listpays decodepay fundchannel listpeers delexpiredinvoice getinfo listsendpays delinvoice getlog newaddr dev-compact-gossip-store getroute -o dev-crash -h --order dev-fail -H pay dev-forget-channel --help paystatus dev-ignore-htlcs help ping dev-listaddrs --human-readable --rpc-file dev-memdump invoice sendpay dev-memleak -J setchannelfee dev-query-channel-range --json stop dev-query-scids -k -V dev-reenable-commit --keywords --version dev-rescan-outputs --lightning-dir waitanyinvoice dev-rhash listchannels waitinvoice dev-send-timestamp-filter listconfigs waitsendpay dev-set-max-scids-encode-size listforwards withdraw dev-sign-last-tx listfunds Signed-off-by: Rusty Russell --- contrib/lightning-cli.bash-completion | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/lightning-cli.bash-completion b/contrib/lightning-cli.bash-completion index b948df068..d5879d558 100644 --- a/contrib/lightning-cli.bash-completion +++ b/contrib/lightning-cli.bash-completion @@ -25,13 +25,13 @@ _lightning_cli() { # get the global options, starting with -- if [[ -z "$cur" || "$cur" =~ ^- ]]; then - globalcmds=$($lightning_cli --help 2>&1 | awk '$1 ~ /^-/ { sub(/,/, ""); print $1}') + globalcmds=$($lightning_cli --help 2>&1 | tr '|' '\n' | sed -n -e 's/ .*//' -e 's/\(-[-a-z0-9A-Z]*\).*/\1/p') fi # get the regular commands if [[ -z "$cur" || "$cur" =~ ^[a-z] ]]; then - helpopts=$($lightning_cli -H help 2>/dev/null | sed -n 's/^[a-z]/&/p' | sed '$ d') + helpopts=$($lightning_cli -H help 2>/dev/null | sed -n 's/^\([a-z][a-z-]*\).*/\1/p' | sed '$ d') fi COMPREPLY=( $( compgen -W "$helpopts $globalcmds" -X "*," -- "$cur" ) )