From e840f4ccff0d2e335ead596388b2b39c9930ad61 Mon Sep 17 00:00:00 2001 From: hael Date: Thu, 12 Sep 2024 10:12:18 +0000 Subject: [PATCH] services files fix --- scripts/scheduler/entrypoint.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/scripts/scheduler/entrypoint.sh b/scripts/scheduler/entrypoint.sh index 3ca8b9c..0bfb136 100644 --- a/scripts/scheduler/entrypoint.sh +++ b/scripts/scheduler/entrypoint.sh @@ -415,18 +415,18 @@ execute_task() { INSTALLED_SERVICES=$(ls /etc/user/config/services/*.json ); SERVICES=""; for SERVICE in $(echo $INSTALLED_SERVICES); do - for ITEM in $SYSTEM_LIST; do - if [ "$(basename $SERVICE)" != "$ITEM" ]; then # not a system file - CONTENT=$(cat $SERVICE | base64 -w0); - if [ "$SERVICES" != "" ]; then - SEP=","; - else - SEP=""; - fi; - SERVICES=$SERVICES$SEP'"'$(cat $SERVICE | jq -r .main.SERVICE_NAME)'": "'$CONTENT'"'; - break; + X=$(echo $SYSTEM_LIST | grep -w "$SERVICE"); + + if [ "$X" == "" ]; then # not a system file + CONTENT=$(cat $SERVICE | base64 -w0); + if [ "$SERVICES" != "" ]; then + SEP=","; + else + SEP=""; fi; - done; + SERVICES=$SERVICES$SEP'"'$(cat $SERVICE | jq -r .main.SERVICE_NAME)'": "'$CONTENT'"'; + break; + fi; done JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "INSTALL_STATUS": "'$INSTALL_STATUS'", "INSTALLED_SERVICES": {'$SERVICES'} }' | jq -r . | base64 -w0);