From 86a8c845c64a11d27e8c1026697d01f669ede161 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Fri, 21 Oct 2022 13:41:41 -0400 Subject: [PATCH] use $BASH instead of $SHELL in setup and cleanup script in case of running under non-bash shell. (#17) fixes https://github.com/IceWhaleTech/CasaOS/issues/572 --- build/scripts/setup/script.d/02-setup-user-service.sh | 2 +- .../share/casaos/cleanup/script.d/02-cleanup-user-service.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/scripts/setup/script.d/02-setup-user-service.sh b/build/scripts/setup/script.d/02-setup-user-service.sh index 93a3474..a7bdb04 100755 --- a/build/scripts/setup/script.d/02-setup-user-service.sh +++ b/build/scripts/setup/script.d/02-setup-user-service.sh @@ -47,7 +47,7 @@ readonly SETUP_SCRIPT_FILEPATH="${SETUP_SCRIPT_DIRECTORY}/${SETUP_SCRIPT_FILENAM { echo "🟩 Running ${SETUP_SCRIPT_FILENAME}..." - $SHELL "${SETUP_SCRIPT_FILEPATH}" "${BUILD_PATH}" + $BASH "${SETUP_SCRIPT_FILEPATH}" "${BUILD_PATH}" } || { echo "🟥 ${SETUP_SCRIPT_FILENAME} failed." exit 1 diff --git a/build/sysroot/usr/share/casaos/cleanup/script.d/02-cleanup-user-service.sh b/build/sysroot/usr/share/casaos/cleanup/script.d/02-cleanup-user-service.sh index 2a4f03c..5a50659 100755 --- a/build/sysroot/usr/share/casaos/cleanup/script.d/02-cleanup-user-service.sh +++ b/build/sysroot/usr/share/casaos/cleanup/script.d/02-cleanup-user-service.sh @@ -43,4 +43,4 @@ readonly SETUP_SCRIPT_FILENAME="cleanup-${APP_NAME_SHORT}.sh" readonly SETUP_SCRIPT_FILEPATH="${SETUP_SCRIPT_DIRECTORY}/${SETUP_SCRIPT_FILENAME}" echo "🟩 Running ${SETUP_SCRIPT_FILENAME}..." -$SHELL "${SETUP_SCRIPT_FILEPATH}" "${BUILD_PATH}" +$BASH "${SETUP_SCRIPT_FILEPATH}" "${BUILD_PATH}"