Răsfoiți Sursa

fix(arkserver): resolve further issues highlighted with ark mod fix (#2766)

* fix(arkserver): resolve further issues highlighted with ark mod fix
Daniel Gibbs 6 ani în urmă
părinte
comite
80c4439280

+ 1 - 1
lgsm/functions/command_monitor.sh

@@ -21,7 +21,7 @@ fn_monitor_check_lockfile(){
 		fn_print_error_eol_nl
 		fn_print_error_eol_nl
 		fn_script_log_error "Checking lockfile: No lockfile found: ERROR"
 		fn_script_log_error "Checking lockfile: No lockfile found: ERROR"
 		fn_sleep_time
 		fn_sleep_time
-		echo -e "	* Start ${selfname} to run monitor."
+		echo -en "* Start ${selfname} to run monitor."
 		core_exit.sh
 		core_exit.sh
 	fi
 	fi
 
 

+ 1 - 1
lgsm/functions/core_messages.sh

@@ -353,7 +353,7 @@ fn_print_error_eol(){
 }
 }
 
 
 fn_print_error_eol_nl(){
 fn_print_error_eol_nl(){
-	echo -en "${red}ERROR${default}"
+	echo -e "${red}ERROR${default}"
 }
 }
 
 
 # WARN
 # WARN

+ 16 - 4
lgsm/functions/fix_ark.sh

@@ -6,19 +6,31 @@
 
 
 # removes the symlink if broken. fixes issue with older versions of LinuxGSM linking to /home/arkserver/steamcmd
 # removes the symlink if broken. fixes issue with older versions of LinuxGSM linking to /home/arkserver/steamcmd
 # rather than ${HOME}/.steam. This fix could be deprecated eventually.
 # rather than ${HOME}/.steam. This fix could be deprecated eventually.
-if [ ! -e "${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux" ]||[ ! -e "${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux/steamapps" ]; then
+if [ ! -e "${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux" ]; then
 	fixname="broken steamcmd symlink"
 	fixname="broken steamcmd symlink"
 	fn_fix_msg_start
 	fn_fix_msg_start
 	rm -f "${serverfiles:?}/Engine/Binaries/ThirdParty/SteamCMD/Linux"
 	rm -f "${serverfiles:?}/Engine/Binaries/ThirdParty/SteamCMD/Linux"
-	rm -f "${serverfiles:?}/Engine/Binaries/ThirdParty/SteamCMD/Linux/steamapps"
+	fn_fix_msg_end
+fi
+
+if [ ! -e "${HOME}/.steam/steamcmd/steamapps" ]; then
+	fixname="broken steamcmd symlink"
+	fn_fix_msg_start
+	rm -f "${HOME}/.steam/steamcmd/steamapps"
 	fn_fix_msg_end
 	fn_fix_msg_end
 fi
 fi
 
 
 # Symlinking the SteamCMD directory into the correct ARK directory so that the mods auto-management will work.
 # Symlinking the SteamCMD directory into the correct ARK directory so that the mods auto-management will work.
-if [ ! -d "${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux" ]||[ ! -d "${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux/steamapps" ]; then
+if [ ! -d "${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux" ]; then
 	fixname="steamcmd symlink"
 	fixname="steamcmd symlink"
 	fn_fix_msg_start
 	fn_fix_msg_start
 	ln -s "${HOME}/.steam/steamcmd" "${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux"
 	ln -s "${HOME}/.steam/steamcmd" "${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux"
-	ln -s "${HOME}/Steam/steamapps" "${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux/steamapps"
+	fn_fix_msg_end
+fi
+
+if [ ! -d "${HOME}/.steam/steamcmd/steamapps" ]; then
+	fixname="steamcmd symlink"
+	fn_fix_msg_start
+	ln -s "${HOME}/Steam/steamapps" "${HOME}/.steam/steamcmd/steamapps"
 	fn_fix_msg_end
 	fn_fix_msg_end
 fi
 fi