Explorar o código

fix(core): set the exit code when a check fails before the log directory exists (#5194)

Set the failure exit code even when the log directory does not exist by calling fn_script_log_fail unconditionally in directory, executable and Steam login checks.

Fixes #5193
BorzakA hai 1 día
pai
achega
9b398c2785

+ 1 - 3
lgsm/modules/check_executable.sh

@@ -12,9 +12,7 @@ execname=$(basename "${executable}")
 if [ ! -f "${executabledir}/${execname}" ]; then
 	fn_print_fail_nl "executable was not found"
 	echo -e "* ${executabledir}/${execname}"
-	if [ -d "${lgsmlogdir}" ]; then
-		fn_script_log_fail "Executable was not found: ${executabledir}/${execname}"
-	fi
+	fn_script_log_fail "Executable was not found: ${executabledir}/${execname}"
 	unset exitbypass
 	core_exit.sh
 fi

+ 2 - 6
lgsm/modules/check_system_dir.sh

@@ -9,16 +9,12 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 if [ ! -d "${serverfiles}" ]; then
 	fn_print_fail_nl "Cannot access ${serverfiles}: No such directory"
-	if [ -d "${lgsmlogdir}" ]; then
-		fn_script_log_fail "Cannot access ${serverfiles}: No such directory."
-	fi
+	fn_script_log_fail "Cannot access ${serverfiles}: No such directory."
 	core_exit.sh
 fi
 
 if [ ! -d "${systemdir}" ] && [ -z "${CI}" ]; then
 	fn_print_fail_nl "Cannot access ${systemdir}: No such directory"
-	if [ -d "${lgsmlogdir}" ]; then
-		fn_script_log_fail "Cannot access ${systemdir}: No such directory."
-	fi
+	fn_script_log_fail "Cannot access ${systemdir}: No such directory."
 	core_exit.sh
 fi

+ 1 - 3
lgsm/modules/core_steamcmd.sh

@@ -24,9 +24,7 @@ fn_check_steamcmd_user() {
 	if [ "${steamuser}" == "username" ]; then
 		fn_print_fail_nl "Steam login not set. Update steamuser in ${configdirserver}"
 		fn_print_nl "	* Change steamuser=\"username\" to a valid steam login."
-		if [ -d "${lgsmlogdir}" ]; then
-			fn_script_log_fail "Steam login not set. Update steamuser in ${configdirserver}"
-		fi
+		fn_script_log_fail "Steam login not set. Update steamuser in ${configdirserver}"
 		core_exit.sh
 	fi
 	# Anonymous user is set if steamuser is missing.