Compare commits
6 Commits
546d53b93e
...
5d84cef63c
Author | SHA1 | Date | |
---|---|---|---|
|
5d84cef63c | ||
|
eda5198904 | ||
|
a4a3dccd66 | ||
|
a2d249e3a1 | ||
dc83baea12 | |||
|
d6b4a4744f |
8
abra
8
abra
@ -553,7 +553,7 @@ sub_app_list (){
|
||||
STATUS="$( [[ $abra___status == "true" ]] && echo "Y" )"
|
||||
|
||||
if [ -n "$STATUS" ]; then
|
||||
if [ -z "$SERVER" ]; then
|
||||
if [ "$SERVER" = "*" ]; then
|
||||
get_servers
|
||||
else
|
||||
SERVERS=( "$SERVER" )
|
||||
@ -576,7 +576,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
|
||||
|
||||
@ -590,7 +590,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
|
||||
@ -601,7 +601,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<Tab>`
|
||||
}
|
||||
|
@ -5,7 +5,7 @@ ABRA_SRC="https://git.autonomic.zone/coop-cloud/abra/raw/tag/$ABRA_VERSION/abra"
|
||||
|
||||
function install_abra {
|
||||
mkdir -p "$HOME/.local/bin"
|
||||
curl "$ABRA_SRC" > "$HOME/.local/bin/abra"
|
||||
curl "$ABRA_SRC" > "$HOME/.local/bin/abra"
|
||||
chmod +x "$HOME/.local/bin/abra"
|
||||
echo "abra installed to $HOME/.loca/bin/abra"
|
||||
}
|
||||
|
Reference in New Issue
Block a user