Akatsuki-Misaki/ArchiSteamFarm
1
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm.git synced 2026-01-01 06:00:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add stdin handling for generic scripts

Browse Source
This commit is contained in:
JustArchi
2017-10-14 11:32:47 +02:00
parent 0c7d9bae48
commit 128b6d2e5b
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ArchiSteamFarm/scripts/generic/ArchiSteamFarm-Service.sh
View File

@@ -12,8 +12,15 @@ ASF_ARGS+=" $*"
trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT
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
if grep -Fq '"Headless": true' 'config/ASF.json'; then
# We're running ASF in headless mode so we don't need STDIN
dotnet ArchiSteamFarm.dll $ASF_ARGS & # Start ASF in the background, trap will work properly due to non-blocking call
wait $! # This will forward dotnet error code, set -e will abort the script if it's non-zero
else
# We're running ASF in non-headless mode, so we need STDIN to be operative
dotnet ArchiSteamFarm.dll $ASF_ARGS # Start ASF in the foreground, trap sadly won't work until process exit
fi
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

11
ArchiSteamFarm/scripts/generic/ArchiSteamFarm.sh
View File

@@ -11,6 +11,13 @@ 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
if grep -Fq '"Headless": true' 'config/ASF.json'; then
# We're running ASF in headless mode so we don't need STDIN
dotnet ArchiSteamFarm.dll $ASF_ARGS & # Start ASF in the background, trap will work properly due to non-blocking call
wait $! # This will forward dotnet error code, set -e will abort the script if it's non-zero
else
# We're running ASF in non-headless mode, so we need STDIN to be operative
dotnet ArchiSteamFarm.dll $ASF_ARGS # Start ASF in the foreground, trap won't work until process exit
fi
chmod +x "$0" # If ASF exited by itself, we need to ensure that our script is still set to +x after auto-update