From 415d65ac1c0d6d3415175f25a0f9959ac4a72e09 Mon Sep 17 00:00:00 2001 From: hael Date: Mon, 21 Jul 2025 08:35:09 +0000 Subject: [PATCH 1/2] Update scripts/scheduler/entrypoint.sh --- scripts/scheduler/entrypoint.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/scheduler/entrypoint.sh b/scripts/scheduler/entrypoint.sh index e668b8f..d5ff172 100644 --- a/scripts/scheduler/entrypoint.sh +++ b/scripts/scheduler/entrypoint.sh @@ -802,6 +802,7 @@ execute_task() { APPS=$(jq -rc '.apps[]' $TREE) for APP in $APPS; do APP_NAME=$(echo "$APP" | jq -r '.name') + APP_SUBTITLE=$(echo "$APP" | jq -r '.subtitle') APP_VERSION=$(echo "$APP" | jq -r '.version') APP_ICON=$(echo "$APP" | jq -r '.icon') if [ "$DEPLOYMENTS" != "" ]; then @@ -809,7 +810,7 @@ execute_task() { else SEP="" fi - DEPLOYMENTS=$DEPLOYMENTS$SEP'"'$APP_NAME'": {"version": "'$APP_VERSION'", "icon": "'$APP_ICON'"}' + DEPLOYMENTS=$DEPLOYMENTS$SEP'"'$APP_NAME'": {"subtitle": "'$APP_SUBTITLE'", "version": "'$APP_VERSION'", "icon": "'$APP_ICON'"}' done done if [ "$DEPLOYMENTS" == "" ]; then @@ -846,6 +847,7 @@ execute_task() { APPS=$(jq -rc '.apps[]' $TREE) for APP in $APPS; do 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_DIR=$(dirname $TREE)"/"$APP_NAME debug "$APP_TEMPLATE" From 279c886c07b8050e3af0c730b65391b1215ce93d Mon Sep 17 00:00:00 2001 From: hael Date: Mon, 21 Jul 2025 10:41:29 +0000 Subject: [PATCH 2/2] Update scripts/scheduler/entrypoint.sh --- scripts/scheduler/entrypoint.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/scheduler/entrypoint.sh b/scripts/scheduler/entrypoint.sh index d5ff172..4731045 100644 --- a/scripts/scheduler/entrypoint.sh +++ b/scripts/scheduler/entrypoint.sh @@ -798,11 +798,12 @@ execute_task() { elif [ "$TASK_NAME" == "deployments" ]; then DEPLOYMENTS="" TREES=$(get_repositories) - for TREE in $TREES; do + for TREE in "$TREES"; do 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_SUBTITLE=$(echo "$APP" | jq -r '.subtitle') + APP_SUBTITLE="$(echo "$APP" | jq -r '.subtitle')" APP_VERSION=$(echo "$APP" | jq -r '.version') APP_ICON=$(echo "$APP" | jq -r '.icon') if [ "$DEPLOYMENTS" != "" ]; then @@ -810,8 +811,9 @@ execute_task() { else SEP="" fi - DEPLOYMENTS=$DEPLOYMENTS$SEP'"'$APP_NAME'": {"subtitle": "'$APP_SUBTITLE'", "version": "'$APP_VERSION'", "icon": "'$APP_ICON'"}' - done + DEPLOYMENTS="$DEPLOYMENTS"$SEP'"'$APP_NAME'": {"subtitle": "'"$APP_SUBTITLE"'", "version": "'"$APP_VERSION"'", "icon": + "'"$APP_ICON"'"}' + done < <(echo "$APPS") # preserve DEPLOYMENTS variable done if [ "$DEPLOYMENTS" == "" ]; then DEPLOYMENTS='"deployments": "NONE"'