From 420f4a5184b5477eace20ab19c0a0005c4e65fe3 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Tue, 24 Mar 2020 21:53:23 +0000
Subject: [PATCH 1/2] fix(arkserver): allow auto selecting of correct steamapps
 dir (#2781)

* fix: correct error with fn_print_error_eol_nl

* fix(arkserver): allow selecting of correct steamapps dir

* added else

* fix(arkserver): allow selecting of correct steamapps dir

steamcmd has two directorys for steamapps based on unknown reasons. fix now allows LinuxGSM to select which ever one is available

* now uses find to locate steamapps dir

* bug
---
 lgsm/functions/fix_ark.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lgsm/functions/fix_ark.sh b/lgsm/functions/fix_ark.sh
index 8563a26ff9..b9cc17e9a3 100644
--- a/lgsm/functions/fix_ark.sh
+++ b/lgsm/functions/fix_ark.sh
@@ -4,6 +4,13 @@
 # Website: https://linuxgsm.com
 # Description: Resolves various issues with ARK: Survival Evolved.
 
+# Steam mods directory selecter
+# This allows LinxuGSM to select either ~/.steam or ~/Steam. depending on what is being used
+
+steamappsfile=$(find ${HOME} -name appworkshop_346110.acf)
+steamappsdir=$(dirname "${steamappsfile}")
+steamappspath=$(cd ${steamappsdir};cd ../;pwd)
+
 # removes the symlink if exists.
 # fixes issue with older versions of LinuxGSM linking to /home/arkserver/steamcmd
 if [ -L "${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux" ]; then
@@ -24,7 +31,7 @@ if [ ! -f "${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux/steamcmd.sh"
 fi
 
 # if the steamapps symlink is incorrect unlink it.
-if [ -d "${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux" ]&&[ -L "${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux/steamapps" ]&&[ "$(readlink ${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux/steamapps)" != "${HOME}/Steam/steamapps" ]; then
+if [ -d "${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux" ]&&[ -L "${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux/steamapps" ]&&[ "$(readlink ${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux/steamapps)" != "${steamappspath}" ]; then
 	fixname="incorrect steamapps symlink"
 	fn_fix_msg_start
 	unlink "${serverfiles:?}/Engine/Binaries/ThirdParty/SteamCMD/Linux/steamapps"
@@ -35,6 +42,6 @@ fi
 if [ ! -L "${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux/steamapps" ]; then
 	fixname="steamapps symlink"
 	fn_fix_msg_start
-	ln -s "${HOME}/Steam/steamapps" "${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux/steamapps"
+	ln -s "${steamappspath}" "${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux/steamapps"
 	fn_fix_msg_end
 fi

From 0257457409a25c5800afb9738d4f79ddee1d47c4 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Tue, 24 Mar 2020 22:06:58 +0000
Subject: [PATCH 2/2] release v20.1.5

---
 linuxgsm.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linuxgsm.sh b/linuxgsm.sh
index c98d5ed3a7..9e5a5b6856 100755
--- a/linuxgsm.sh
+++ b/linuxgsm.sh
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v20.1.4"
+version="v20.1.5"
 shortname="core"
 gameservername="core"
 rootdir=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")