From 55a406573b09157e7b3f5ce333ba2f80c7d12e8c Mon Sep 17 00:00:00 2001 From: 3wc <3wc.git@doesthisthing.work> Date: Wed, 30 Dec 2020 22:19:28 +0200 Subject: [PATCH] Change -v option to `version` subcommand --- abra | 162 +++++++++++++++++++++++++++++++---------------------------- 1 file changed, 84 insertions(+), 78 deletions(-) diff --git a/abra b/abra index b3e9462..3fb8f5b 100755 --- a/abra +++ b/abra @@ -2,6 +2,7 @@ GIT_URL="https://git.autonomic.zone/coop-cloud/" ABRA_DIR="${ABRA_DIR:-$HOME/.abra}" +ABRA_VERSION="0.4.1" ####################################### # Global help @@ -33,12 +34,12 @@ Usage: abra [options] server init abra [options] server apps [--status] abra [options] upgrade + abra [options] version Options: -e, --env= Environment variables to load -h, --help Show this message and exit -s, --stack= Name of the target stack - -v, --version Show program version See 'abra help ' to read about a specific subcommand. " @@ -142,65 +143,65 @@ 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:1466} -usage=${DOC:40:1158}; digest=f9a9a -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(){ -required 52 28 15 33; }; node_65(){ required 52 28 15 34; }; node_66(){ -either 35 36; }; node_67(){ required 66; }; node_68(){ optional 10; } -node_69(){ required 52 28 15 67 68; }; node_70(){ optional 16; }; node_71(){ -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 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___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_ \ -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}__env" "${prefix}__help" "${prefix}__stack" \ -"${prefix}__version" "${prefix}__server" "${prefix}__domain" "${prefix}__pass" \ +printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:1447} +usage=${DOC:40:1183}; digest=e7fac +shorts=(-h -s -e '' '' '' '' '' '' '' '' '' '') +longs=(--help --stack --env --server --domain --pass --auto --status --skip-check --force --no-tty --user --all) +argcounts=(0 1 1 1 1 0 0 0 0 0 0 1 0); node_0(){ switch __help 0; }; node_1(){ +value __stack 1; }; node_2(){ value __env 2; }; node_3(){ value __server 3; } +node_4(){ value __domain 4; }; node_5(){ switch __pass 5; }; node_6(){ +switch __auto 6; }; node_7(){ switch __status 7; }; node_8(){ +switch __skip_check 8; }; node_9(){ switch __force 9; }; node_10(){ +switch __no_tty 10; }; node_11(){ value __user 11; }; node_12(){ switch __all 12 +}; node_13(){ value _type_ a; }; node_14(){ value _domain_ a; }; node_15(){ +value _service_ a; }; node_16(){ value _src_ a; }; node_17(){ value _dst_ a; } +node_18(){ value _args_ a true; }; node_19(){ value _secret_ a; }; node_20(){ +value _version_ a; }; node_21(){ value _cmd_ a; }; node_22(){ value _data_ a; } +node_23(){ value _command_ a; }; node_24(){ value _host_ a; }; node_25(){ +value _user_ a; }; node_26(){ value _port_ a; }; node_27(){ _command app; } +node_28(){ _command new; }; node_29(){ _command list; }; node_30(){ _command ls +}; node_31(){ _command deploy; }; node_32(){ _command undeploy; }; node_33(){ +_command config; }; node_34(){ _command delete; }; node_35(){ _command rm; } +node_36(){ _command logs; }; node_37(){ _command cp; }; node_38(){ +_command check; }; node_39(){ _command ps; }; node_40(){ _command run; } +node_41(){ _command secret; }; node_42(){ _command auto; }; node_43(){ +_command generate; }; node_44(){ _command insert; }; node_45(){ _command server +}; node_46(){ _command add; }; node_47(){ _command init; }; node_48(){ +_command apps; }; node_49(){ _command upgrade; }; node_50(){ _command version; } +node_51(){ optional 0 1 2; }; node_52(){ optional 51; }; node_53(){ optional 3 +}; node_54(){ optional 4; }; node_55(){ optional 5; }; node_56(){ optional 6; } +node_57(){ required 52 27 28 53 54 55 56 13; }; node_58(){ either 29 30; } +node_59(){ required 58; }; node_60(){ optional 7; }; node_61(){ +required 52 27 59 60 53; }; node_62(){ optional 8; }; node_63(){ +required 52 27 14 31 62; }; node_64(){ required 52 27 14 32; }; node_65(){ +required 52 27 14 33; }; node_66(){ either 34 35; }; node_67(){ required 66; } +node_68(){ optional 9; }; node_69(){ required 52 27 14 67 68; }; node_70(){ +optional 15; }; node_71(){ required 52 27 14 36 70; }; node_72(){ +required 52 27 14 37 16 17; }; node_73(){ required 52 27 14 38; }; node_74(){ +required 52 27 14 39; }; node_75(){ optional 10; }; node_76(){ optional 11; } +node_77(){ oneormore 18; }; node_78(){ required 52 27 14 40 75 76 15 77; } +node_79(){ required 52 27 14 41 42 55; }; node_80(){ optional 21; }; node_81(){ +required 52 27 14 41 43 19 20 80 55; }; node_82(){ +required 52 27 14 41 44 19 20 22 55; }; node_83(){ either 19 12; }; node_84(){ +required 83; }; node_85(){ required 52 27 14 41 67 84 55 68; }; node_86(){ +optional 77; }; node_87(){ required 52 27 14 23 86; }; node_88(){ optional 25; } +node_89(){ optional 26; }; node_90(){ required 52 45 46 24 88 89; }; node_91(){ +required 52 45 59; }; node_92(){ required 52 45 24 35; }; node_93(){ +required 52 45 24 47; }; node_94(){ required 52 45 24 48 60; }; node_95(){ +required 52 49; }; node_96(){ required 52 50; }; node_97(){ +either 57 61 63 64 65 69 71 72 73 74 78 79 81 82 85 87 90 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:1183}" >&2 +exit 1; }'; unset var___help var___stack var___env 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 var_version; parse 98 "$@" +local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__help" "${prefix}__stack" \ +"${prefix}__env" "${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_" \ @@ -211,11 +212,10 @@ unset "${prefix}__env" "${prefix}__help" "${prefix}__stack" \ "${prefix}config" "${prefix}delete" "${prefix}rm" "${prefix}logs" \ "${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}' +"${prefix}add" "${prefix}init" "${prefix}apps" "${prefix}upgrade" \ +"${prefix}version"; eval "${prefix}"'__help=${var___help:-false}' eval "${prefix}"'__stack=${var___stack:-}' -eval "${prefix}"'__version=${var___version:-false}' +eval "${prefix}"'__env=${var___env:-}' eval "${prefix}"'__server=${var___server:-}' eval "${prefix}"'__domain=${var___domain:-}' eval "${prefix}"'__pass=${var___pass:-false}' @@ -257,21 +257,22 @@ eval "${prefix}"'server=${var_server:-false}' eval "${prefix}"'add=${var_add:-false}' eval "${prefix}"'init=${var_init:-false}' eval "${prefix}"'apps=${var_apps:-false}' -eval "${prefix}"'upgrade=${var_upgrade:-false}'; local docopt_i=1 +eval "${prefix}"'upgrade=${var_upgrade:-false}' +eval "${prefix}"'version=${var_version:-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}__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_" \ -"${prefix}_dst_" "${prefix}_args_" "${prefix}_secret_" "${prefix}_version_" \ -"${prefix}_cmd_" "${prefix}_data_" "${prefix}_command_" "${prefix}_host_" \ -"${prefix}_user_" "${prefix}_port_" "${prefix}app" "${prefix}new" \ -"${prefix}list" "${prefix}ls" "${prefix}deploy" "${prefix}undeploy" \ -"${prefix}config" "${prefix}delete" "${prefix}rm" "${prefix}logs" \ -"${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"; done; } +declare -p "${prefix}__help" "${prefix}__stack" "${prefix}__env" \ +"${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_" "${prefix}_dst_" \ +"${prefix}_args_" "${prefix}_secret_" "${prefix}_version_" "${prefix}_cmd_" \ +"${prefix}_data_" "${prefix}_command_" "${prefix}_host_" "${prefix}_user_" \ +"${prefix}_port_" "${prefix}app" "${prefix}new" "${prefix}list" "${prefix}ls" \ +"${prefix}deploy" "${prefix}undeploy" "${prefix}config" "${prefix}delete" \ +"${prefix}rm" "${prefix}logs" "${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" "${prefix}version"; done; } # docopt parser above, complete command for generating this parser is `docopt.sh abra` PROGRAM_NAME=$(basename "$0") @@ -992,6 +993,11 @@ sub_upgrade() { curl https://install.abra.autonomic.zone | bash } +###### .. version +sub_version() { + echo "$ABRA_VERSION" +} + ###### .. stack ... sub_stack() { # shellcheck disable=SC2068