Merge branch 'prompt-cleanup' of ssh://git.autonomic.zone:2222/coop-cloud/abra into prompt-cleanup

Missed issue beore since I only changed the function, not these strays
Contiunation of PR #162

CHANGELOG.md

@@ -9,9 +9,12 @@
 
 # abra x.x.x (UNRELEASED)
 
+# abra 0.7.4 (2021-05-10)
+
 - Sort `apps.json` when publishing ([39a7fc0](https://git.autonomic.zone/coop-cloud/abra/commit/39a7fc04fb5df1a6d78b84f51838530ab3eb76db))
 - Fix publishing of rating for new apps ([0e28af9](https://git.autonomic.zone/coop-cloud/abra/commit/0e28af9eb1af6c6da705b4614ddd173c60576629))
 - Detect compose filenames in `n+1` release generation ([ffc569e](https://git.autonomic.zone/coop-cloud/abra/commit/ffc569e275df7ca784a4db1a3331e17975fd8c87))
+- Fix secret generation when specifying length ([3a353f4](https://git.autonomic.zone/coop-cloud/abra/commit/3a353f4062baccde2c9f175b03afb2db6d462ae4))
 
 # abra 0.7.3 (2021-04-28)
 

abra

@@ -3,7 +3,7 @@
 GIT_URL="https://git.autonomic.zone/coop-cloud/"
 ABRA_APPS_URL="https://apps.coopcloud.tech"
 ABRA_DIR="${ABRA_DIR:-$HOME/.abra}"
-ABRA_VERSION="0.7.3"
+ABRA_VERSION="0.7.4"
 ABRA_BACKUP_DIR="${ABRA_BACKUP_DIR:-$ABRA_DIR/backups}"
 ABRA_VENDOR_DIR="$ABRA_DIR/vendor"
 ABRA_APPS_JSON="${ABRA_DIR}/apps.json"
@@ -808,17 +808,17 @@ ensure_stack_deployed() {
 }
 
 ensure_domain_deployed() {
-  DOMAIN=$1
+  local domain=$1
 
-  warning "Waiting for $DOMAIN to come up..."
+  warning "Waiting for $domain to come up..."
 
   idx=1
-  until curl --output /dev/null --silent --head --fail "$DOMAIN"; do
+  until curl --output /dev/null --silent --head --fail "$domain"; do
-    debug "Polled $DOMAIN $idx time(s) already"
+    debug "Polled $domain $idx time(s) already"
     sleep 3
     idx=$(("$idx" + 1))
     if [[ $idx -gt 10 ]]; then
-      error "$DOMAIN still isn't up, check status by running \"abra app ${STACK_NAME} ps\""
+      error "$domain still isn't up, check status by running \"abra app ${STACK_NAME} ps\""
     fi
   done
 }
@@ -899,7 +899,7 @@ prompt_confirm() {
     return
   fi
 
-  read -rp "Continue? (y/[n])? " choice
+  read -rp "Continue? [y/N]? " choice
 
   case "$choice" in
     y|Y ) return ;;
@@ -1649,7 +1649,7 @@ sub_app_secret_generate(){
   if [[ -n "$LENGTH" ]]; then
     if [ -z "$abra__cmd_" ]; then
       require_binary pwgen
-      abra__cmd_="pwgen -s \"$LENGTH\" 1"
+      abra__cmd_="pwgen -s $LENGTH 1"
     fi
   else
     if [ -z "$abra__cmd_" ]; then
@@ -2099,7 +2099,7 @@ sub_recipe_release() {
 
   success "All compose files updated; new version is $new_version"
 
-  read -rp "Commit your changes to git? (y/[n])? " choice
+  read -rp "Commit your changes to git? [y/N]? " choice
 
   if [ "${choice,,}" != "y" ]; then
     return
@@ -2107,7 +2107,7 @@ sub_recipe_release() {
 
   git commit -avem "Version $new_version; sync labels" || exit
 
-  read -rp "Tag this as \`$new_version\`? (y/[n])? " choice
+  read -rp "Tag this as \`$new_version\`? [y/N]? " choice
 
   if [ "${choice,,}" != "y" ]; then
     return

deploy/install.abra.autonomic.zone/installer

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ABRA_VERSION="0.7.3"
+ABRA_VERSION="0.7.4"
 GIT_URL="https://git.autonomic.zone/coop-cloud/abra"
 ABRA_SRC="$GIT_URL/raw/tag/$ABRA_VERSION/abra"
 ABRA_DIR="${ABRA_DIR:-$HOME/.abra/}"