- removed testing vars + -o nounset
This commit is contained in:
		@@ -5,6 +5,7 @@ if [ "${DEBUGGING}" = "true" ]; then
 | 
				
			|||||||
fi
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
set -o errexit
 | 
					set -o errexit
 | 
				
			||||||
 | 
					set -o nounset
 | 
				
			||||||
set -o pipefail
 | 
					set -o pipefail
 | 
				
			||||||
 | 
					
 | 
				
			||||||
echo "starting entrypoint.sh"
 | 
					echo "starting entrypoint.sh"
 | 
				
			||||||
@@ -27,7 +28,7 @@ fi
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
if [ -e "/home/prepareServer.sh" ]; then
 | 
					if [ -e "/home/prepareServer.sh" ]; then
 | 
				
			||||||
	cd /home
 | 
						cd /home
 | 
				
			||||||
	./prepareServer.sh
 | 
						./prepareServer.sh "$@"
 | 
				
			||||||
	cd "$STEAM_PATH"
 | 
						cd "$STEAM_PATH"
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -36,19 +37,6 @@ fi
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# --- Apply LGSM Workarounds ---
 | 
					 | 
				
			||||||
#force fetch of command_console.sh
 | 
					 | 
				
			||||||
if [ ! -e "${STEAM_PATH}/lgsm/functions/command_console.sh" ]; then
 | 
					 | 
				
			||||||
	wget -O "${STEAM_PATH}/lgsm/functions/command_console.sh" "https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/master/lgsm/functions/command_console.sh"
 | 
					 | 
				
			||||||
	chmod +x "${STEAM_PATH}/lgsm/functions/command_console.sh"
 | 
					 | 
				
			||||||
fi
 | 
					 | 
				
			||||||
#skip confirmation
 | 
					 | 
				
			||||||
sed -i 's/! fn_prompt_yn "Continue?" Y/[ "1" != "1" ]/' "${STEAM_PATH}/lgsm/functions/command_console.sh"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# --- Start Server ---
 | 
					# --- Start Server ---
 | 
				
			||||||
#start server
 | 
					#start server
 | 
				
			||||||
IS_RUNNING="true"
 | 
					IS_RUNNING="true"
 | 
				
			||||||
@@ -60,8 +48,9 @@ function stopServer() {
 | 
				
			|||||||
	echo "server stopped!"
 | 
						echo "server stopped!"
 | 
				
			||||||
	echo "stopping entrypoint..."
 | 
						echo "stopping entrypoint..."
 | 
				
			||||||
	IS_RUNNING="false"
 | 
						IS_RUNNING="false"
 | 
				
			||||||
 | 
						echo "done!"
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
./"$SERVER_EXECUTABLE" start
 | 
					./"$SERVER_EXECUTABLE" start &
 | 
				
			||||||
trap stopServer SIGTERM
 | 
					trap stopServer SIGTERM
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#start cron
 | 
					#start cron
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user