From d6b4a4744f225ed65b2455515369dbe0953cc5c9 Mon Sep 17 00:00:00 2001 From: 3wc <3wc.git@doesthisthing.work> Date: Fri, 1 Jan 2021 23:00:20 +0200 Subject: [PATCH] =?UTF-8?q?Fix=20`abra=20app=20ls`=20for=20app=20=E2=86=92?= =?UTF-8?q?=20type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- abra | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/abra b/abra index abeb478..f018fcf 100755 --- a/abra +++ b/abra @@ -555,7 +555,7 @@ sub_app_list (){ for i in "${!ENV_FILES[@]}"; do # Output header inside the loop, so it's included in the pipe to `column` if [ "$i" == 0 ]; then - printf " DOMAIN\tAPP\tSERVER%s%s\n" "${STATUS:+ }" "${STATUS:+STATUS}" + printf " DOMAIN\tTYPE\tSERVER%s%s\n" "${STATUS:+ }" "${STATUS:+STATUS}" printf " --\t--\t--%s\n" "${STATUS:+ --}" fi @@ -569,7 +569,7 @@ sub_app_list (){ set -a # shellcheck disable=SC1090 - APP="$(source "$ENV_FILE" && echo "$APP")" + TYPE="$(source "$ENV_FILE" && echo "$TYPE")" # shellcheck disable=SC1090 APP_STACK_NAME="$(source "$ENV_FILE" && echo "$STACK_NAME")" set +a @@ -580,7 +580,7 @@ sub_app_list (){ if [ -n "$STATUS" ]; then APP_STATUS=$( printf '%s\n' "${DEPLOYED_APPS[@]}" | grep -qP "^${SERVER}~${APP_STACK_NAME}$" && echo "deployed" || echo "inactive") fi - printf " %s\t%s\t%s%s\n" "$DOMAIN" "$APP" "$SERVER" "${STATUS:+ }${APP_STATUS}" + printf " %s\t%s\t%s%s\n" "$DOMAIN" "$TYPE" "$SERVER" "${STATUS:+ }${APP_STATUS}" done | column -s' ' -t # Align table `-t` based on tab characters -s`^V` }