Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
279c886c07 | ||
|
415d65ac1c | ||
|
6d00aefb21 |
@@ -798,10 +798,12 @@ execute_task() {
|
|||||||
elif [ "$TASK_NAME" == "deployments" ]; then
|
elif [ "$TASK_NAME" == "deployments" ]; then
|
||||||
DEPLOYMENTS=""
|
DEPLOYMENTS=""
|
||||||
TREES=$(get_repositories)
|
TREES=$(get_repositories)
|
||||||
for TREE in $TREES; do
|
for TREE in "$TREES"; do
|
||||||
APPS=$(jq -rc '.apps[]' $TREE)
|
APPS=$(jq -rc '.apps[]' $TREE)
|
||||||
for APP in $APPS; do
|
#for APP in "$APPS"; do #space problem
|
||||||
|
while IFS= read -r APP; do
|
||||||
APP_NAME=$(echo "$APP" | jq -r '.name')
|
APP_NAME=$(echo "$APP" | jq -r '.name')
|
||||||
|
APP_SUBTITLE="$(echo "$APP" | jq -r '.subtitle')"
|
||||||
APP_VERSION=$(echo "$APP" | jq -r '.version')
|
APP_VERSION=$(echo "$APP" | jq -r '.version')
|
||||||
APP_ICON=$(echo "$APP" | jq -r '.icon')
|
APP_ICON=$(echo "$APP" | jq -r '.icon')
|
||||||
if [ "$DEPLOYMENTS" != "" ]; then
|
if [ "$DEPLOYMENTS" != "" ]; then
|
||||||
@@ -809,8 +811,9 @@ execute_task() {
|
|||||||
else
|
else
|
||||||
SEP=""
|
SEP=""
|
||||||
fi
|
fi
|
||||||
DEPLOYMENTS=$DEPLOYMENTS$SEP'"'$APP_NAME'": {"version": "'$APP_VERSION'", "icon": "'$APP_ICON'"}'
|
DEPLOYMENTS="$DEPLOYMENTS"$SEP'"'$APP_NAME'": {"subtitle": "'"$APP_SUBTITLE"'", "version": "'"$APP_VERSION"'", "icon":
|
||||||
done
|
"'"$APP_ICON"'"}'
|
||||||
|
done < <(echo "$APPS") # preserve DEPLOYMENTS variable
|
||||||
done
|
done
|
||||||
if [ "$DEPLOYMENTS" == "" ]; then
|
if [ "$DEPLOYMENTS" == "" ]; then
|
||||||
DEPLOYMENTS='"deployments": "NONE"'
|
DEPLOYMENTS='"deployments": "NONE"'
|
||||||
@@ -846,6 +849,7 @@ execute_task() {
|
|||||||
APPS=$(jq -rc '.apps[]' $TREE)
|
APPS=$(jq -rc '.apps[]' $TREE)
|
||||||
for APP in $APPS; do
|
for APP in $APPS; do
|
||||||
APP_NAME=$(echo "$APP" | jq -r '.name' | awk '{print tolower($0)}')
|
APP_NAME=$(echo "$APP" | jq -r '.name' | awk '{print tolower($0)}')
|
||||||
|
APP_SUBTITLE=$(echo "$APP" | jq -r '.subtitle')
|
||||||
APP_VERSION=$(echo "$APP" | jq -r '.version')
|
APP_VERSION=$(echo "$APP" | jq -r '.version')
|
||||||
APP_DIR=$(dirname $TREE)"/"$APP_NAME
|
APP_DIR=$(dirname $TREE)"/"$APP_NAME
|
||||||
debug "$APP_TEMPLATE"
|
debug "$APP_TEMPLATE"
|
||||||
@@ -901,7 +905,7 @@ execute_task() {
|
|||||||
sh /scripts/check_pid.sh "$PID" "$SHARED" "deploy-$DEPLOY_NAME" "$DATE" "$DEBUG" &
|
sh /scripts/check_pid.sh "$PID" "$SHARED" "deploy-$DEPLOY_NAME" "$DATE" "$DEBUG" &
|
||||||
|
|
||||||
elif [ "$DEPLOY_ACTION" == "edit" ]; then
|
elif [ "$DEPLOY_ACTION" == "edit" ]; then
|
||||||
|
JSON_TARGET=""
|
||||||
DEPLOY_PAYLOAD=$(echo "$JSON" | jq -r .PAYLOAD) # base64 list of key-value pairs in JSON
|
DEPLOY_PAYLOAD=$(echo "$JSON" | jq -r .PAYLOAD) # base64 list of key-value pairs in JSON
|
||||||
|
|
||||||
# stop service before edit
|
# stop service before edit
|
||||||
|
Reference in New Issue
Block a user