From ad4e4ed92f6337433af7d9b9d51cce248ec1ceb1 Mon Sep 17 00:00:00 2001
From: JustArchi <JustArchi@JustArchi.net>
Date: Wed, 18 Oct 2017 15:10:32 +0200
Subject: [PATCH] Don't catch EXIT signal

It's not only pointless, but causes issues when scripts are being run in another set -e container.
---
 ArchiSteamFarm/scripts/generic/ArchiSteamFarm-Service.sh | 2 +-
 ArchiSteamFarm/scripts/generic/ArchiSteamFarm.sh         | 2 +-
 cc.sh                                                    | 2 +-
 run.sh                                                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ArchiSteamFarm/scripts/generic/ArchiSteamFarm-Service.sh b/ArchiSteamFarm/scripts/generic/ArchiSteamFarm-Service.sh
index b966d4977..46edb36eb 100755
--- a/ArchiSteamFarm/scripts/generic/ArchiSteamFarm-Service.sh
+++ b/ArchiSteamFarm/scripts/generic/ArchiSteamFarm-Service.sh
@@ -9,7 +9,7 @@ fi
 ASF_ARGS+=" $*"
 
 # Kill underlying ASF process on shell process exit
-trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT
+trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM
 
 while :; do
 	if grep -Eq '"Headless":\s+?true' 'config/ASF.json'; then
diff --git a/ArchiSteamFarm/scripts/generic/ArchiSteamFarm.sh b/ArchiSteamFarm/scripts/generic/ArchiSteamFarm.sh
index 7a035539b..190b3ef06 100755
--- a/ArchiSteamFarm/scripts/generic/ArchiSteamFarm.sh
+++ b/ArchiSteamFarm/scripts/generic/ArchiSteamFarm.sh
@@ -9,7 +9,7 @@ fi
 ASF_ARGS+=" $*"
 
 # Kill underlying ASF process on shell process exit
-trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT
+trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM
 
 if grep -Eq '"Headless":\s+?true' 'config/ASF.json'; then
 	# We're running ASF in headless mode so we don't need STDIN
diff --git a/cc.sh b/cc.sh
index 74ecabdab..8a3890ddd 100755
--- a/cc.sh
+++ b/cc.sh
@@ -26,7 +26,7 @@ if [[ "$TEST" -eq 1 ]]; then
 	PROJECTS+=("ArchiSteamFarm.Tests")
 fi
 
-trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT
+trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM
 
 if ! hash dotnet 2>/dev/null; then
 	echo "ERROR: dotnet CLI tools are not installed!"
diff --git a/run.sh b/run.sh
index 1ef2b2502..97ee64164 100755
--- a/run.sh
+++ b/run.sh
@@ -13,7 +13,7 @@ fi
 ASF_ARGS+=" $*"
 
 # Kill underlying ASF process on shell process exit
-trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT
+trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM
 
 if ! hash dotnet 2>/dev/null; then
 	echo "ERROR: dotnet CLI tools are not installed!"