From b9e97688d67a7a4231a5bd5eef85361b03bb3585 Mon Sep 17 00:00:00 2001 From: 3wc <3wc.git@doesthisthing.work> Date: Wed, 30 Dec 2020 13:43:17 +0200 Subject: [PATCH] ... and update docopt --- abra | 65 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/abra b/abra index 90c8f03..b3e9462 100755 --- a/abra +++ b/abra @@ -144,32 +144,31 @@ printf -- "cat <<'EOM' >&2\n%s\nEOM\n" "$1"; }; error() { [[ -n $1 ]] && stderr "$1"; stderr "$usage"; _return 1; }; _return() { printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:1466} usage=${DOC:40:1158}; digest=f9a9a -shorts=(-v -h -e -s '' '' '' '' '' '' '' '' '' '') -longs=(--version --help --env --stack --server --domain --pass --auto --status --skip-check --force --no-tty --user --all) -argcounts=(0 0 1 1 1 1 0 0 0 0 0 0 1 0); node_0(){ switch __version 0; } -node_1(){ switch __help 1; }; node_2(){ value __env 2; }; node_3(){ -value __stack 3; }; node_4(){ value __server 4; }; node_5(){ value __domain 5; } -node_6(){ switch __pass 6; }; node_7(){ switch __auto 7; }; node_8(){ -switch __status 8; }; node_9(){ switch __skip_check 9; }; node_10(){ -switch __force 10; }; node_11(){ switch __no_tty 11; }; node_12(){ -value __user 12; }; node_13(){ switch __all 13; }; node_14(){ value _type_ a; } -node_15(){ value _domain_ a; }; node_16(){ value _service_ a; }; node_17(){ -value _src_ a; }; node_18(){ value _dst_ a; }; node_19(){ value _args_ a true; } -node_20(){ value _secret_ a; }; node_21(){ value _version_ a; }; node_22(){ -value _cmd_ a; }; node_23(){ value _data_ a; }; node_24(){ value _command_ a; } -node_25(){ value _host_ a; }; node_26(){ value _user_ a; }; node_27(){ -value _port_ a; }; node_28(){ _command app; }; node_29(){ _command new; } -node_30(){ _command list; }; node_31(){ _command ls; }; node_32(){ -_command deploy; }; node_33(){ _command undeploy; }; node_34(){ _command config -}; node_35(){ _command delete; }; node_36(){ _command rm; }; node_37(){ -_command logs; }; node_38(){ _command cp; }; node_39(){ _command check; } -node_40(){ _command ps; }; node_41(){ _command run; }; node_42(){ -_command secret; }; node_43(){ _command auto; }; node_44(){ _command generate; } -node_45(){ _command insert; }; node_46(){ _command server; }; node_47(){ -_command add; }; node_48(){ _command init; }; node_49(){ _command apps; } -node_50(){ _command upgrade; }; node_51(){ optional 0 1 2 3; }; node_52(){ -optional 51; }; node_53(){ optional 4; }; node_54(){ optional 5; }; node_55(){ -optional 6; }; node_56(){ optional 7; }; node_57(){ +shorts=(-e -h -s -v '' '' '' '' '' '' '' '' '' '') +longs=(--env --help --stack --version --server --domain --pass --auto --status --skip-check --force --no-tty --user --all) +argcounts=(1 0 1 0 1 1 0 0 0 0 0 0 1 0); node_0(){ value __env 0; }; node_1(){ +switch __help 1; }; node_2(){ value __stack 2; }; node_3(){ switch __version 3 +}; node_4(){ value __server 4; }; node_5(){ value __domain 5; }; node_6(){ +switch __pass 6; }; node_7(){ switch __auto 7; }; node_8(){ switch __status 8; } +node_9(){ switch __skip_check 9; }; node_10(){ switch __force 10; }; node_11(){ +switch __no_tty 11; }; node_12(){ value __user 12; }; node_13(){ switch __all 13 +}; node_14(){ value _type_ a; }; node_15(){ value _domain_ a; }; node_16(){ +value _service_ a; }; node_17(){ value _src_ a; }; node_18(){ value _dst_ a; } +node_19(){ value _args_ a true; }; node_20(){ value _secret_ a; }; node_21(){ +value _version_ a; }; node_22(){ value _cmd_ a; }; node_23(){ value _data_ a; } +node_24(){ value _command_ a; }; node_25(){ value _host_ a; }; node_26(){ +value _user_ a; }; node_27(){ value _port_ a; }; node_28(){ _command app; } +node_29(){ _command new; }; node_30(){ _command list; }; node_31(){ _command ls +}; node_32(){ _command deploy; }; node_33(){ _command undeploy; }; node_34(){ +_command config; }; node_35(){ _command delete; }; node_36(){ _command rm; } +node_37(){ _command logs; }; node_38(){ _command cp; }; node_39(){ +_command check; }; node_40(){ _command ps; }; node_41(){ _command run; } +node_42(){ _command secret; }; node_43(){ _command auto; }; node_44(){ +_command generate; }; node_45(){ _command insert; }; node_46(){ _command server +}; node_47(){ _command add; }; node_48(){ _command init; }; node_49(){ +_command apps; }; node_50(){ _command upgrade; }; node_51(){ optional 0 1 2 3; } +node_52(){ optional 51; }; node_53(){ optional 4; }; node_54(){ optional 5; } +node_55(){ optional 6; }; node_56(){ optional 7; }; node_57(){ required 52 28 29 53 54 55 56 14; }; node_58(){ either 30 31; }; node_59(){ required 58; }; node_60(){ optional 8; }; node_61(){ required 52 28 59 60 53; } node_62(){ optional 9; }; node_63(){ required 52 28 15 32 62; }; node_64(){ @@ -192,7 +191,7 @@ required 52 50; }; node_96(){ either 57 61 63 64 65 69 71 72 73 74 78 79 81 82 85 87 90 91 92 93 94 95; } node_97(){ required 96; }; cat <<<' docopt_exit() { [[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1158}" >&2 -exit 1; }'; unset var___version var___help var___env var___stack var___server \ +exit 1; }'; unset var___env var___help var___stack var___version var___server \ var___domain var___pass var___auto var___status var___skip_check var___force \ var___no_tty var___user var___all var__type_ var__domain_ var__service_ \ var__src_ var__dst_ var__args_ var__secret_ var__version_ var__cmd_ var__data_ \ @@ -200,8 +199,8 @@ var__command_ var__host_ var__user_ var__port_ var_app var_new var_list var_ls \ var_deploy var_undeploy var_config var_delete var_rm var_logs var_cp var_check \ var_ps var_run var_secret var_auto var_generate var_insert var_server var_add \ var_init var_apps var_upgrade; parse 97 "$@"; local prefix=${DOCOPT_PREFIX:-''} -unset "${prefix}__version" "${prefix}__help" "${prefix}__env" \ -"${prefix}__stack" "${prefix}__server" "${prefix}__domain" "${prefix}__pass" \ +unset "${prefix}__env" "${prefix}__help" "${prefix}__stack" \ +"${prefix}__version" "${prefix}__server" "${prefix}__domain" "${prefix}__pass" \ "${prefix}__auto" "${prefix}__status" "${prefix}__skip_check" \ "${prefix}__force" "${prefix}__no_tty" "${prefix}__user" "${prefix}__all" \ "${prefix}_type_" "${prefix}_domain_" "${prefix}_service_" "${prefix}_src_" \ @@ -213,10 +212,10 @@ unset "${prefix}__version" "${prefix}__help" "${prefix}__env" \ "${prefix}cp" "${prefix}check" "${prefix}ps" "${prefix}run" "${prefix}secret" \ "${prefix}auto" "${prefix}generate" "${prefix}insert" "${prefix}server" \ "${prefix}add" "${prefix}init" "${prefix}apps" "${prefix}upgrade" -eval "${prefix}"'__version=${var___version:-false}' -eval "${prefix}"'__help=${var___help:-false}' eval "${prefix}"'__env=${var___env:-}' +eval "${prefix}"'__help=${var___help:-false}' eval "${prefix}"'__stack=${var___stack:-}' +eval "${prefix}"'__version=${var___version:-false}' eval "${prefix}"'__server=${var___server:-}' eval "${prefix}"'__domain=${var___domain:-}' eval "${prefix}"'__pass=${var___pass:-false}' @@ -260,8 +259,8 @@ eval "${prefix}"'init=${var_init:-false}' eval "${prefix}"'apps=${var_apps:-false}' eval "${prefix}"'upgrade=${var_upgrade:-false}'; local docopt_i=1 [[ $BASH_VERSION =~ ^4.3 ]] && docopt_i=2; for ((;docopt_i>0;docopt_i--)); do -declare -p "${prefix}__version" "${prefix}__help" "${prefix}__env" \ -"${prefix}__stack" "${prefix}__server" "${prefix}__domain" "${prefix}__pass" \ +declare -p "${prefix}__env" "${prefix}__help" "${prefix}__stack" \ +"${prefix}__version" "${prefix}__server" "${prefix}__domain" "${prefix}__pass" \ "${prefix}__auto" "${prefix}__status" "${prefix}__skip_check" \ "${prefix}__force" "${prefix}__no_tty" "${prefix}__user" "${prefix}__all" \ "${prefix}_type_" "${prefix}_domain_" "${prefix}_service_" "${prefix}_src_" \