Prefer --fast for skipping all checks

Closes https://git.autonomic.zone/coop-cloud/abra/issues/169

CHANGELOG.md

@@ -15,6 +15,7 @@
 - Add release automation via [drone-abra](https://git.autonomic.zone/coop-cloud/drone-abra) ([#56](https://git.autonomic.zone/coop-cloud/organising/issues/56))
 - Move `apps.json` generation to [auto-apps-json](https://git.autonomic.zone/coop-cloud/auto-apps-json) ([#125](https://git.autonomic.zone/coop-cloud/abra/issues/125))
 - Add Github mirroring script ([4ef433312d](https://git.autonomic.zone/coop-cloud/abra/commit/4ef433312dd0b0ace91b3c285f82f3973093d92d))
+- Drop `--skip-version-check`/`--no-domain-poll`/`--no-state-poll` in favour of `--fast` ([#169](https://git.autonomic.zone/coop-cloud/abra/issues/169))
 
 # abra 8.0.1 (2021-05-31)
 

abra

@@ -19,7 +19,7 @@ Usage:
   abra [options] app (list|ls) [--status] [--server=<server>] [--type=<type>]
   abra [options] app new [--server=<server>] [--domain=<domain>] [--app-name=<app_name>] [--pass] [--secrets] <type>
   abra [options] app <app> backup (<service>|--all)
-  abra [options] app <app> deploy [--update] [--force] [--fast] [--skip-version-check] [--no-domain-poll] [--no-state-poll] [<version>]
+  abra [options] app <app> deploy [--update] [--force] [--fast] [<version>]
   abra [options] app <app> check
   abra [options] app <app> version
   abra [options] app <app> config
@@ -167,109 +167,104 @@ 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:2492}
+printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:2432}
-usage=${DOC:40:1883}; digest=f774b
+usage=${DOC:40:1823}; digest=14f0b
-shorts=(-e -s -U -h -C -v -d -n -b '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
+shorts=(-n -b -d -s -e -h -U -v -C '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
-longs=(--env --stack --skip-update --help --skip-check --verbose --debug --no-prompt --branch --status --server --type --domain --app-name --pass --secrets --all --update --force --fast --skip-version-check --no-domain-poll --no-state-poll --volumes --no-tty --user --dev)
+longs=(--no-prompt --branch --debug --stack --env --help --skip-update --verbose --skip-check --status --server --type --domain --app-name --pass --secrets --all --update --force --fast --volumes --no-tty --user --dev)
-argcounts=(1 1 0 0 0 0 0 0 1 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 1 0); node_0(){
+argcounts=(0 1 0 1 1 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 1 0); node_0(){
-value __env 0; }; node_1(){ value __stack 1; }; node_2(){ switch __skip_update 2
+switch __no_prompt 0; }; node_1(){ value __branch 1; }; node_2(){
-}; node_3(){ switch __help 3; }; node_4(){ switch __skip_check 4; }; node_5(){
+switch __debug 2; }; node_3(){ value __stack 3; }; node_4(){ value __env 4; }
-switch __verbose 5; }; node_6(){ switch __debug 6; }; node_7(){
+node_5(){ switch __help 5; }; node_6(){ switch __skip_update 6; }; node_7(){
-switch __no_prompt 7; }; node_8(){ value __branch 8; }; node_9(){
+switch __verbose 7; }; node_8(){ switch __skip_check 8; }; node_9(){
 switch __status 9; }; node_10(){ value __server 10; }; node_11(){
 value __type 11; }; node_12(){ value __domain 12; }; node_13(){
 value __app_name 13; }; node_14(){ switch __pass 14; }; node_15(){
 switch __secrets 15; }; node_16(){ switch __all 16; }; node_17(){
 switch __update 17; }; node_18(){ switch __force 18; }; node_19(){
-switch __fast 19; }; node_20(){ switch __skip_version_check 20; }; node_21(){
+switch __fast 19; }; node_20(){ switch __volumes 20; }; node_21(){
-switch __no_domain_poll 21; }; node_22(){ switch __no_state_poll 22; }
+switch __no_tty 21; }; node_22(){ value __user 22; }; node_23(){ switch __dev 23
-node_23(){ switch __volumes 23; }; node_24(){ switch __no_tty 24; }; node_25(){
+}; node_24(){ value _type_ a; }; node_25(){ value _app_ a; }; node_26(){
-value __user 25; }; node_26(){ switch __dev 26; }; node_27(){ value _type_ a; }
+value _service_ a; }; node_27(){ value _version_ a; }; node_28(){ value _src_ a
-node_28(){ value _app_ a; }; node_29(){ value _service_ a; }; node_30(){
+}; node_29(){ value _dst_ a; }; node_30(){ value _backup_file_ a; }; node_31(){
-value _version_ a; }; node_31(){ value _src_ a; }; node_32(){ value _dst_ a; }
+value _args_ a true; }; node_32(){ value _secret_ a; }; node_33(){ value _cmd_ a
-node_33(){ value _backup_file_ a; }; node_34(){ value _args_ a true; }
+}; node_34(){ value _data_ a; }; node_35(){ value _volume_ a; }; node_36(){
-node_35(){ value _secret_ a; }; node_36(){ value _cmd_ a; }; node_37(){
+value _command_ a; }; node_37(){ value _recipe_ a; }; node_38(){ value _host_ a
-value _data_ a; }; node_38(){ value _volume_ a; }; node_39(){ value _command_ a
+}; node_39(){ value _user_ a; }; node_40(){ value _port_ a; }; node_41(){
-}; node_40(){ value _recipe_ a; }; node_41(){ value _host_ a; }; node_42(){
+value _provider_ a; }; node_42(){ value _subcommands_ a true; }; node_43(){
-value _user_ a; }; node_43(){ value _port_ a; }; node_44(){ value _provider_ a
+_command app; }; node_44(){ _command list; }; node_45(){ _command ls; }
-}; node_45(){ value _subcommands_ a true; }; node_46(){ _command app; }
+node_46(){ _command new; }; node_47(){ _command backup; }; node_48(){
-node_47(){ _command list; }; node_48(){ _command ls; }; node_49(){ _command new
+_command deploy; }; node_49(){ _command check; }; node_50(){ _command version; }
-}; node_50(){ _command backup; }; node_51(){ _command deploy; }; node_52(){
+node_51(){ _command config; }; node_52(){ _command cp; }; node_53(){
-_command check; }; node_53(){ _command version; }; node_54(){ _command config; }
+_command logs; }; node_54(){ _command ps; }; node_55(){ _command restore; }
-node_55(){ _command cp; }; node_56(){ _command logs; }; node_57(){ _command ps
+node_56(){ _command rm; }; node_57(){ _command delete; }; node_58(){
-}; node_58(){ _command restore; }; node_59(){ _command rm; }; node_60(){
+_command run; }; node_59(){ _command rollback; }; node_60(){ _command secret; }
-_command delete; }; node_61(){ _command run; }; node_62(){ _command rollback; }
+node_61(){ _command generate; }; node_62(){ _command insert; }; node_63(){
-node_63(){ _command secret; }; node_64(){ _command generate; }; node_65(){
+_command undeploy; }; node_64(){ _command volume; }; node_65(){ _command recipe
-_command insert; }; node_66(){ _command undeploy; }; node_67(){ _command volume
+}; node_66(){ _command create; }; node_67(){ _command release; }; node_68(){
-}; node_68(){ _command recipe; }; node_69(){ _command create; }; node_70(){
+_command versions; }; node_69(){ _command server; }; node_70(){ _command add; }
-_command release; }; node_71(){ _command versions; }; node_72(){ _command server
+node_71(){ _command __ --; }; node_72(){ _command init; }; node_73(){
-}; node_73(){ _command add; }; node_74(){ _command __ --; }; node_75(){
+_command apps; }; node_74(){ _command upgrade; }; node_75(){ _command doctor; }
-_command init; }; node_76(){ _command apps; }; node_77(){ _command upgrade; }
+node_76(){ _command help; }; node_77(){ optional 0 1 2 3 4 5 6 7 8; }
-node_78(){ _command doctor; }; node_79(){ _command help; }; node_80(){
+node_78(){ optional 77; }; node_79(){ either 44 45; }; node_80(){ required 79; }
-optional 0 1 2 3 4 5 6 7 8; }; node_81(){ optional 80; }; node_82(){
+node_81(){ optional 9; }; node_82(){ optional 10; }; node_83(){ optional 11; }
-either 47 48; }; node_83(){ required 82; }; node_84(){ optional 9; }; node_85(){
+node_84(){ required 78 43 80 81 82 83; }; node_85(){ optional 12; }; node_86(){
-optional 10; }; node_86(){ optional 11; }; node_87(){ required 81 46 83 84 85 86
+optional 13; }; node_87(){ optional 14; }; node_88(){ optional 15; }; node_89(){
-}; node_88(){ optional 12; }; node_89(){ optional 13; }; node_90(){ optional 14
+required 78 43 46 82 85 86 87 88 24; }; node_90(){ either 26 16; }; node_91(){
-}; node_91(){ optional 15; }; node_92(){ required 81 46 49 85 88 89 90 91 27; }
+required 90; }; node_92(){ required 78 43 25 47 91; }; node_93(){ optional 17; }
-node_93(){ either 29 16; }; node_94(){ required 93; }; node_95(){
+node_94(){ optional 18; }; node_95(){ optional 19; }; node_96(){ optional 27; }
-required 81 46 28 50 94; }; node_96(){ optional 17; }; node_97(){ optional 18; }
+node_97(){ required 78 43 25 48 93 94 95 96; }; node_98(){ required 78 43 25 49
-node_98(){ optional 19; }; node_99(){ optional 20; }; node_100(){ optional 21; }
+}; node_99(){ required 78 43 25 50; }; node_100(){ required 78 43 25 51; }
-node_101(){ optional 22; }; node_102(){ optional 30; }; node_103(){
+node_101(){ required 78 43 25 52 28 29; }; node_102(){ optional 26; }
-required 81 46 28 51 96 97 98 99 100 101 102; }; node_104(){
+node_103(){ required 78 43 25 53 102; }; node_104(){ required 78 43 25 54; }
-required 81 46 28 52; }; node_105(){ required 81 46 28 53; }; node_106(){
+node_105(){ required 78 43 25 55 91; }; node_106(){ either 56 57; }; node_107(){
-required 81 46 28 54; }; node_107(){ required 81 46 28 55 31 32; }; node_108(){
+required 106; }; node_108(){ optional 20; }; node_109(){
-optional 29; }; node_109(){ required 81 46 28 56 108; }; node_110(){
+required 78 43 25 107 108 88; }; node_110(){ optional 30; }; node_111(){
-required 81 46 28 57; }; node_111(){ required 81 46 28 58 94; }; node_112(){
+required 78 43 25 55 26 110; }; node_112(){ optional 21; }; node_113(){
-either 59 60; }; node_113(){ required 112; }; node_114(){ optional 23; }
+optional 22; }; node_114(){ oneormore 31; }; node_115(){
-node_115(){ required 81 46 28 113 114 91; }; node_116(){ optional 33; }
+required 78 43 25 58 112 113 26 114; }; node_116(){ required 78 43 25 59 96; }
-node_117(){ required 81 46 28 58 29 116; }; node_118(){ optional 24; }
+node_117(){ required 32 27; }; node_118(){ either 117 16; }; node_119(){
-node_119(){ optional 25; }; node_120(){ oneormore 34; }; node_121(){
+required 118; }; node_120(){ optional 33; }; node_121(){
-required 81 46 28 61 118 119 29 120; }; node_122(){ required 81 46 28 62 102; }
+required 78 43 25 60 61 119 120 87; }; node_122(){
-node_123(){ required 35 30; }; node_124(){ either 123 16; }; node_125(){
+required 78 43 25 60 62 32 27 34 87; }; node_123(){ either 32 16; }; node_124(){
-required 124; }; node_126(){ optional 36; }; node_127(){
+required 123; }; node_125(){ required 78 43 25 60 107 124 87; }; node_126(){
-required 81 46 28 63 64 125 126 90; }; node_128(){
+required 78 43 25 63; }; node_127(){ required 78 43 25 64 45; }; node_128(){
-required 81 46 28 63 65 35 30 37 90; }; node_129(){ either 35 16; }; node_130(){
+either 35 16; }; node_129(){ required 128; }; node_130(){
-required 129; }; node_131(){ required 81 46 28 63 113 130 90; }; node_132(){
+required 78 43 25 64 107 129; }; node_131(){ optional 114; }; node_132(){
-required 81 46 28 66; }; node_133(){ required 81 46 28 67 48; }; node_134(){
+required 78 43 25 36 131; }; node_133(){ required 78 65 45; }; node_134(){
-either 38 16; }; node_135(){ required 134; }; node_136(){
+required 78 65 66 37; }; node_135(){ required 78 65 37 67 94; }; node_136(){
-required 81 46 28 67 113 135; }; node_137(){ optional 120; }; node_138(){
+required 78 65 37 68; }; node_137(){ optional 39; }; node_138(){ optional 40; }
-required 81 46 28 39 137; }; node_139(){ required 81 68 48; }; node_140(){
+node_139(){ required 78 69 70 38 137 138; }; node_140(){
-required 81 68 69 40; }; node_141(){ required 81 68 40 70 97; }; node_142(){
+required 78 69 46 41 71 31; }; node_141(){ required 78 69 80; }; node_142(){
-required 81 68 40 71; }; node_143(){ optional 42; }; node_144(){ optional 43; }
+required 78 69 38 56; }; node_143(){ required 78 69 38 72; }; node_144(){
-node_145(){ required 81 72 73 41 143 144; }; node_146(){
+required 78 69 38 73 81; }; node_145(){ optional 23; }; node_146(){
-required 81 72 49 44 74 34; }; node_147(){ required 81 72 83; }; node_148(){
+required 78 74 145; }; node_147(){ required 78 50; }; node_148(){ required 78 75
-required 81 72 41 59; }; node_149(){ required 81 72 41 75; }; node_150(){
+}; node_149(){ oneormore 42; }; node_150(){ optional 149; }; node_151(){
-required 81 72 41 76 84; }; node_151(){ optional 26; }; node_152(){
+required 78 76 150; }; node_152(){ required 78; }; node_153(){
-required 81 77 151; }; node_153(){ required 81 53; }; node_154(){ required 81 78
+either 84 89 92 97 98 99 100 101 103 104 105 109 111 115 116 121 122 125 126 127 130 132 133 134 135 136 139 140 141 142 143 144 146 147 148 151 152
-}; node_155(){ oneormore 45; }; node_156(){ optional 155; }; node_157(){
+}; node_154(){ required 153; }; cat <<<' docopt_exit() {
-required 81 79 156; }; node_158(){ required 81; }; node_159(){
+[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1823}" >&2
-either 87 92 95 103 104 105 106 107 109 110 111 115 117 121 122 127 128 131 132 133 136 138 139 140 141 142 145 146 147 148 149 150 152 153 154 157 158
+exit 1; }'; unset var___no_prompt var___branch var___debug var___stack \
-}; node_160(){ required 159; }; cat <<<' docopt_exit() {
+var___env var___help var___skip_update var___verbose var___skip_check \
-[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1883}" >&2
-exit 1; }'; unset var___env var___stack var___skip_update var___help \
-var___skip_check var___verbose var___debug var___no_prompt var___branch \
 var___status var___server var___type var___domain var___app_name var___pass \
-var___secrets var___all var___update var___force var___fast \
+var___secrets var___all var___update var___force var___fast var___volumes \
-var___skip_version_check var___no_domain_poll var___no_state_poll \
+var___no_tty var___user var___dev var__type_ var__app_ var__service_ \
-var___volumes var___no_tty var___user var___dev var__type_ var__app_ \
+var__version_ var__src_ var__dst_ var__backup_file_ var__args_ var__secret_ \
-var__service_ var__version_ var__src_ var__dst_ var__backup_file_ var__args_ \
+var__cmd_ var__data_ var__volume_ var__command_ var__recipe_ var__host_ \
-var__secret_ var__cmd_ var__data_ var__volume_ var__command_ var__recipe_ \
+var__user_ var__port_ var__provider_ var__subcommands_ var_app var_list var_ls \
-var__host_ var__user_ var__port_ var__provider_ var__subcommands_ var_app \
+var_new var_backup var_deploy var_check var_version var_config var_cp var_logs \
-var_list var_ls var_new var_backup var_deploy var_check var_version var_config \
+var_ps var_restore var_rm var_delete var_run var_rollback var_secret \
-var_cp var_logs var_ps var_restore var_rm var_delete var_run var_rollback \
+var_generate var_insert var_undeploy var_volume var_recipe var_create \
-var_secret var_generate var_insert var_undeploy var_volume var_recipe \
+var_release var_versions var_server var_add var___ var_init var_apps \
-var_create var_release var_versions var_server var_add var___ var_init \
+var_upgrade var_doctor var_help; parse 154 "$@"
-var_apps var_upgrade var_doctor var_help; parse 160 "$@"
+local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__no_prompt" \
-local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__env" "${prefix}__stack" \
+"${prefix}__branch" "${prefix}__debug" "${prefix}__stack" "${prefix}__env" \
-"${prefix}__skip_update" "${prefix}__help" "${prefix}__skip_check" \
+"${prefix}__help" "${prefix}__skip_update" "${prefix}__verbose" \
-"${prefix}__verbose" "${prefix}__debug" "${prefix}__no_prompt" \
+"${prefix}__skip_check" "${prefix}__status" "${prefix}__server" \
-"${prefix}__branch" "${prefix}__status" "${prefix}__server" "${prefix}__type" \
+"${prefix}__type" "${prefix}__domain" "${prefix}__app_name" "${prefix}__pass" \
-"${prefix}__domain" "${prefix}__app_name" "${prefix}__pass" \
 "${prefix}__secrets" "${prefix}__all" "${prefix}__update" "${prefix}__force" \
-"${prefix}__fast" "${prefix}__skip_version_check" "${prefix}__no_domain_poll" \
+"${prefix}__fast" "${prefix}__volumes" "${prefix}__no_tty" "${prefix}__user" \
-"${prefix}__no_state_poll" "${prefix}__volumes" "${prefix}__no_tty" \
+"${prefix}__dev" "${prefix}_type_" "${prefix}_app_" "${prefix}_service_" \
-"${prefix}__user" "${prefix}__dev" "${prefix}_type_" "${prefix}_app_" \
+"${prefix}_version_" "${prefix}_src_" "${prefix}_dst_" \
-"${prefix}_service_" "${prefix}_version_" "${prefix}_src_" "${prefix}_dst_" \
 "${prefix}_backup_file_" "${prefix}_args_" "${prefix}_secret_" \
 "${prefix}_cmd_" "${prefix}_data_" "${prefix}_volume_" "${prefix}_command_" \
 "${prefix}_recipe_" "${prefix}_host_" "${prefix}_user_" "${prefix}_port_" \
@@ -282,15 +277,15 @@ local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__env" "${prefix}__stack" \
 "${prefix}recipe" "${prefix}create" "${prefix}release" "${prefix}versions" \
 "${prefix}server" "${prefix}add" "${prefix}__" "${prefix}init" "${prefix}apps" \
 "${prefix}upgrade" "${prefix}doctor" "${prefix}help"
-eval "${prefix}"'__env=${var___env:-}'
-eval "${prefix}"'__stack=${var___stack:-}'
-eval "${prefix}"'__skip_update=${var___skip_update:-false}'
-eval "${prefix}"'__help=${var___help:-false}'
-eval "${prefix}"'__skip_check=${var___skip_check:-false}'
-eval "${prefix}"'__verbose=${var___verbose:-false}'
-eval "${prefix}"'__debug=${var___debug:-false}'
 eval "${prefix}"'__no_prompt=${var___no_prompt:-false}'
 eval "${prefix}"'__branch=${var___branch:-}'
+eval "${prefix}"'__debug=${var___debug:-false}'
+eval "${prefix}"'__stack=${var___stack:-}'
+eval "${prefix}"'__env=${var___env:-}'
+eval "${prefix}"'__help=${var___help:-false}'
+eval "${prefix}"'__skip_update=${var___skip_update:-false}'
+eval "${prefix}"'__verbose=${var___verbose:-false}'
+eval "${prefix}"'__skip_check=${var___skip_check:-false}'
 eval "${prefix}"'__status=${var___status:-false}'
 eval "${prefix}"'__server=${var___server:-}'
 eval "${prefix}"'__type=${var___type:-}'
@@ -302,9 +297,6 @@ eval "${prefix}"'__all=${var___all:-false}'
 eval "${prefix}"'__update=${var___update:-false}'
 eval "${prefix}"'__force=${var___force:-false}'
 eval "${prefix}"'__fast=${var___fast:-false}'
-eval "${prefix}"'__skip_version_check=${var___skip_version_check:-false}'
-eval "${prefix}"'__no_domain_poll=${var___no_domain_poll:-false}'
-eval "${prefix}"'__no_state_poll=${var___no_state_poll:-false}'
 eval "${prefix}"'__volumes=${var___volumes:-false}'
 eval "${prefix}"'__no_tty=${var___no_tty:-false}'
 eval "${prefix}"'__user=${var___user:-}'
@@ -359,23 +351,21 @@ eval "${prefix}"'upgrade=${var_upgrade:-false}'
 eval "${prefix}"'doctor=${var_doctor:-false}'
 eval "${prefix}"'help=${var_help:-false}'; local docopt_i=1
 [[ $BASH_VERSION =~ ^4.3 ]] && docopt_i=2; for ((;docopt_i>0;docopt_i--)); do
-declare -p "${prefix}__env" "${prefix}__stack" "${prefix}__skip_update" \
+declare -p "${prefix}__no_prompt" "${prefix}__branch" "${prefix}__debug" \
-"${prefix}__help" "${prefix}__skip_check" "${prefix}__verbose" \
+"${prefix}__stack" "${prefix}__env" "${prefix}__help" "${prefix}__skip_update" \
-"${prefix}__debug" "${prefix}__no_prompt" "${prefix}__branch" \
+"${prefix}__verbose" "${prefix}__skip_check" "${prefix}__status" \
-"${prefix}__status" "${prefix}__server" "${prefix}__type" "${prefix}__domain" \
+"${prefix}__server" "${prefix}__type" "${prefix}__domain" \
 "${prefix}__app_name" "${prefix}__pass" "${prefix}__secrets" "${prefix}__all" \
-"${prefix}__update" "${prefix}__force" "${prefix}__fast" \
+"${prefix}__update" "${prefix}__force" "${prefix}__fast" "${prefix}__volumes" \
-"${prefix}__skip_version_check" "${prefix}__no_domain_poll" \
+"${prefix}__no_tty" "${prefix}__user" "${prefix}__dev" "${prefix}_type_" \
-"${prefix}__no_state_poll" "${prefix}__volumes" "${prefix}__no_tty" \
+"${prefix}_app_" "${prefix}_service_" "${prefix}_version_" "${prefix}_src_" \
-"${prefix}__user" "${prefix}__dev" "${prefix}_type_" "${prefix}_app_" \
+"${prefix}_dst_" "${prefix}_backup_file_" "${prefix}_args_" \
-"${prefix}_service_" "${prefix}_version_" "${prefix}_src_" "${prefix}_dst_" \
+"${prefix}_secret_" "${prefix}_cmd_" "${prefix}_data_" "${prefix}_volume_" \
-"${prefix}_backup_file_" "${prefix}_args_" "${prefix}_secret_" \
+"${prefix}_command_" "${prefix}_recipe_" "${prefix}_host_" "${prefix}_user_" \
-"${prefix}_cmd_" "${prefix}_data_" "${prefix}_volume_" "${prefix}_command_" \
+"${prefix}_port_" "${prefix}_provider_" "${prefix}_subcommands_" \
-"${prefix}_recipe_" "${prefix}_host_" "${prefix}_user_" "${prefix}_port_" \
+"${prefix}app" "${prefix}list" "${prefix}ls" "${prefix}new" "${prefix}backup" \
-"${prefix}_provider_" "${prefix}_subcommands_" "${prefix}app" "${prefix}list" \
+"${prefix}deploy" "${prefix}check" "${prefix}version" "${prefix}config" \
-"${prefix}ls" "${prefix}new" "${prefix}backup" "${prefix}deploy" \
+"${prefix}cp" "${prefix}logs" "${prefix}ps" "${prefix}restore" "${prefix}rm" \
-"${prefix}check" "${prefix}version" "${prefix}config" "${prefix}cp" \
-"${prefix}logs" "${prefix}ps" "${prefix}restore" "${prefix}rm" \
 "${prefix}delete" "${prefix}run" "${prefix}rollback" "${prefix}secret" \
 "${prefix}generate" "${prefix}insert" "${prefix}undeploy" "${prefix}volume" \
 "${prefix}recipe" "${prefix}create" "${prefix}release" "${prefix}versions" \
@@ -1304,17 +1294,14 @@ _abra_backup_mysql() {
 
 ###### .. app deploy
 help_app_deploy (){
-  echo "abra [options] app <app> deploy [--update] [--force] [--fast] [--skip-version-check] [--no-domain-poll] [--no-state-poll]
+  echo "abra [options] app <app> deploy [--update] [--force] [--fast]
 
 Deploy app <app> to the configured server.
 
 OPTIONS
   --update                Consent to deploying an updated app version
   --force                 Force a deployment regardless of state
-  --skip-version-check    Don't try and detect deployed version
+  --fast                  Run deployment with various safety checks
-  --no-domain-poll        Don't wait for the configured domain to come up
-  --no-state-poll         Don't watch deployment state for success/failure
-  --fast                  Alias for --skip-version-check --no-domain-poll
 
 POWERED BY
   docker stack deploy -c compose.yml <app>"
@@ -1328,9 +1315,9 @@ sub_app_deploy (){
     NO_DOMAIN_POLL=true
     NO_STATE_POLL=true
   else
-    SKIP_VERSION_CHECK=$abra___skip_version_check
+    SKIP_VERSION_CHECK=false
-    NO_DOMAIN_POLL=$abra___no_domain_poll
+    NO_DOMAIN_POLL=false
-    NO_STATE_POLL=$abra___no_state_poll
+    NO_STATE_POLL=false
   fi
 
   if [ ! "$abra__version_" = "dev" ]; then
@@ -2535,8 +2522,7 @@ abra() {
     abra___skip_check abra__backup_file_ abra___verbose abra___debug \
     abra___help abra___branch abra___volumes abra__provider_ abra___type \
     abra___dev abra___update abra___no_prompt abra___force \
-    abra___skip_version_check abra__recipe_ abra___no_domain_poll \
+    abra__recipe_ abra___fast abra__volume_
-    abra___fast abra__volume_ abra___no_state_poll
 
   if ! type tput > /dev/null 2>&1; then
     tput() {