roxxers/abra
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: roxxers:fix-pwgen
Branches Tags
roxxers:main roxxers:prompt roxxers:fix-pwgen roxxers:fix-subcommand-select roxxers:digest-version roxxers:backup_restore roxxers:command_help_2 roxxers:merge-logging roxxers:monorepo
..
compare: roxxers:prompt
Branches Tags
roxxers:prompt roxxers:main roxxers:fix-pwgen roxxers:fix-subcommand-select roxxers:digest-version roxxers:backup_restore roxxers:command_help_2 roxxers:merge-logging roxxers:monorepo

2 Commits
fix-pwgen ... prompt

Author SHA1 Message Date
Roxie Gibson
e8ac353453 feat: switches to conventional confirmation prompt 2021-05-08 21:45:52 +01:00
3wc
552abdd980 Don't clobber global $DOMAIN variable 
Closes #156
 2021-05-06 00:43:16 +02:00
1 changed files with 7 additions and 7 deletions
Expand all files Collapse all files

14
abra
View File

@ -808,17 +808,17 @@ ensure_stack_deployed() {
} }
ensure_domain_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 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 sleep 3
idx=$(("$idx" + 1)) idx=$(("$idx" + 1))
if [[ $idx -gt 10 ]]; then 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 fi
done done
} }
@ -899,7 +899,7 @@ prompt_confirm() {
return return
fi fi
read -rp "Continue? (y/[n])? " choice read -rp "Continue? [y/N]? " choice
case "$choice" in case "$choice" in
y|Y ) return ;; y|Y ) return ;;
@ -1649,7 +1649,7 @@ sub_app_secret_generate(){
if [[ -n "$LENGTH" ]]; then if [[ -n "$LENGTH" ]]; then
if [ -z "$abra__cmd_" ]; then if [ -z "$abra__cmd_" ]; then
require_binary pwgen require_binary pwgen
abra__cmd_="pwgen -s $LENGTH 1" abra__cmd_="pwgen -s \"$LENGTH\" 1"
fi fi
else else
if [ -z "$abra__cmd_" ]; then if [ -z "$abra__cmd_" ]; then