From 1055805c8d268d676da61a7ba6604d54912f4ba5 Mon Sep 17 00:00:00 2001 From: 3wc <3wc.git@doesthisthing.work> Date: Wed, 30 Dec 2020 13:33:57 +0200 Subject: [PATCH] Merge duplicate `run` commands Closes #57 --- abra | 92 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/abra b/abra index dee715e..90c8f03 100755 --- a/abra +++ b/abra @@ -22,7 +22,6 @@ Usage: abra [options] app check abra [options] app ps abra [options] app run [--no-tty] [--user=] ... - abra [options] app run ... abra [options] app secret auto [--pass] abra [options] app secret generate [] [--pass] abra [options] app secret insert [--pass] @@ -143,33 +142,34 @@ eval "var_$1+=($value)"; else eval "var_$1=$value"; fi; return 0; fi; done return 1; }; stdout() { printf -- "cat <<'EOM'\n%s\nEOM\n" "$1"; }; stderr() { 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:1520} -usage=${DOC:40:1212}; digest=7df47 -shorts=(-e -h -v -s '' '' '' '' '' '' '' '' '' '') -longs=(--env --help --version --stack --server --domain --pass --auto --status --skip-check --force --no-tty --user --all) -argcounts=(1 0 0 1 1 1 0 0 0 0 0 0 1 0); node_0(){ value __env 0; }; node_1(){ -switch __help 1; }; node_2(){ switch __version 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(){ +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(){ 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(){ @@ -180,27 +180,27 @@ required 52 28 15 37 70; }; node_72(){ required 52 28 15 38 17 18; }; node_73(){ required 52 28 15 39; }; node_74(){ required 52 28 15 40; }; node_75(){ optional 11; }; node_76(){ optional 12; }; node_77(){ oneormore 19; } node_78(){ required 52 28 15 41 75 76 16 77; }; node_79(){ -required 52 28 15 41 16 77; }; node_80(){ required 52 28 15 42 43 55; } -node_81(){ optional 22; }; node_82(){ required 52 28 15 42 44 20 21 81 55; } -node_83(){ required 52 28 15 42 45 20 21 23 55; }; node_84(){ either 20 13; } -node_85(){ required 84; }; node_86(){ required 52 28 15 42 67 85 55 68; } -node_87(){ optional 77; }; node_88(){ required 52 28 15 24 87; }; node_89(){ -optional 26; }; node_90(){ optional 27; }; node_91(){ required 52 46 47 25 89 90 -}; node_92(){ required 52 46 59; }; node_93(){ required 52 46 25 36; } -node_94(){ required 52 46 25 48; }; node_95(){ required 52 46 25 49 60; } -node_96(){ required 52 50; }; node_97(){ -either 57 61 63 64 65 69 71 72 73 74 78 79 80 82 83 86 88 91 92 93 94 95 96; } -node_98(){ required 97; }; cat <<<' docopt_exit() { -[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1212}" >&2 -exit 1; }'; unset var___env var___help var___version var___stack var___server \ +required 52 28 15 42 43 55; }; node_80(){ optional 22; }; node_81(){ +required 52 28 15 42 44 20 21 80 55; }; node_82(){ +required 52 28 15 42 45 20 21 23 55; }; node_83(){ either 20 13; }; node_84(){ +required 83; }; node_85(){ required 52 28 15 42 67 84 55 68; }; node_86(){ +optional 77; }; node_87(){ required 52 28 15 24 86; }; node_88(){ optional 26; } +node_89(){ optional 27; }; node_90(){ required 52 46 47 25 88 89; }; node_91(){ +required 52 46 59; }; node_92(){ required 52 46 25 36; }; node_93(){ +required 52 46 25 48; }; node_94(){ required 52 46 25 49 60; }; node_95(){ +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 \ 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_ \ 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 98 "$@"; local prefix=${DOCOPT_PREFIX:-''} -unset "${prefix}__env" "${prefix}__help" "${prefix}__version" \ +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" \ "${prefix}__auto" "${prefix}__status" "${prefix}__skip_check" \ "${prefix}__force" "${prefix}__no_tty" "${prefix}__user" "${prefix}__all" \ @@ -213,9 +213,9 @@ unset "${prefix}__env" "${prefix}__help" "${prefix}__version" \ "${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}"'__env=${var___env:-}' -eval "${prefix}"'__help=${var___help:-false}' eval "${prefix}"'__version=${var___version:-false}' +eval "${prefix}"'__help=${var___help:-false}' +eval "${prefix}"'__env=${var___env:-}' eval "${prefix}"'__stack=${var___stack:-}' eval "${prefix}"'__server=${var___server:-}' eval "${prefix}"'__domain=${var___domain:-}' @@ -260,7 +260,7 @@ 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}__env" "${prefix}__help" "${prefix}__version" \ +declare -p "${prefix}__version" "${prefix}__help" "${prefix}__env" \ "${prefix}__stack" "${prefix}__server" "${prefix}__domain" "${prefix}__pass" \ "${prefix}__auto" "${prefix}__status" "${prefix}__skip_check" \ "${prefix}__force" "${prefix}__no_tty" "${prefix}__user" "${prefix}__all" \