From 0c7d9bae48f6d8371cd4eae57ff53642b23cefcc Mon Sep 17 00:00:00 2001 From: JustArchi Date: Sat, 14 Oct 2017 07:47:51 +0200 Subject: [PATCH] Handle chmod +x for generic helper scripts --- ArchiSteamFarm/scripts/generic/ArchiSteamFarm-Service.sh | 5 +++-- ArchiSteamFarm/scripts/generic/ArchiSteamFarm.sh | 8 ++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ArchiSteamFarm/scripts/generic/ArchiSteamFarm-Service.sh b/ArchiSteamFarm/scripts/generic/ArchiSteamFarm-Service.sh index 0f95dd13e..5878ee54f 100755 --- a/ArchiSteamFarm/scripts/generic/ArchiSteamFarm-Service.sh +++ b/ArchiSteamFarm/scripts/generic/ArchiSteamFarm-Service.sh @@ -11,8 +11,9 @@ ASF_ARGS+=" $*" # Kill underlying ASF process on shell process exit trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT -while [[ -f ArchiSteamFarm.dll ]]; do - dotnet ArchiSteamFarm.dll $ASF_ARGS & +while :; do + dotnet ArchiSteamFarm.dll $ASF_ARGS & # We need to start ASF in the background for trap to work wait $! # This will forward dotnet error code, set -e will abort the script if it's non-zero + chmod +x "$0" # If ASF exited by itself, we need to ensure that our script is still set to +x after auto-update sleep 1 done diff --git a/ArchiSteamFarm/scripts/generic/ArchiSteamFarm.sh b/ArchiSteamFarm/scripts/generic/ArchiSteamFarm.sh index 5edab3dd0..5f9c633f4 100755 --- a/ArchiSteamFarm/scripts/generic/ArchiSteamFarm.sh +++ b/ArchiSteamFarm/scripts/generic/ArchiSteamFarm.sh @@ -8,5 +8,9 @@ fi ASF_ARGS+=" $*" -# We don't need our shell anymore, just replace the current process instead of starting a new one -exec dotnet ArchiSteamFarm.dll $ASF_ARGS +# Kill underlying ASF process on shell process exit +trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT + +dotnet ArchiSteamFarm.dll $ASF_ARGS & # We need to start ASF in the background for trap to work +wait $! # This will forward dotnet error code, set -e will abort the script if it's non-zero +chmod +x "$0" # If ASF exited by itself, we need to ensure that our script is still set to +x after auto-update