Merge pull request #47 from Oldsouldier/fix_shutdown_signal

Propagate signals to launch.sh and fully await shutdown
escapingnetwork · Sep 4, 2024 · 92dbf3b · 92dbf3b
2 parents 5d6416e + f5da7a3
commit 92dbf3b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/entry.sh b/entry.sh
@@ -12,4 +12,4 @@ fi
 
 bash "${STEAMCMDDIR}/steamcmd.sh" +force_install_dir "$STEAMAPPDIR" +login anonymous +app_update "$STEAMAPPID" +app_update "$STEAMAPPID_TOOL" +quit
 
-bash "./launch.sh"
+exec bash "./launch.sh"
diff --git a/launch.sh b/launch.sh
@@ -9,8 +9,8 @@ ckpid=""
 function kill_corekeeperserver {
         if [[ ! -z "$ckpid" ]]; then
                 kill $ckpid
+                wait $ckpid
         fi
-        sleep 1
         if [[ ! -z "$xvfbpid" ]]; then
                 kill $xvfbpid
         fi