From 8a29dcc7aa6ecf8477406d0d0c61f0d15aa18a90 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Wed, 11 Mar 2020 09:13:29 +0000
Subject: [PATCH] fix(fix): fix sof2 LD_LIBRARY_PATH and standardise usage
 (#2731)

---
 lgsm/functions/fix_ins.sh   | 2 +-
 lgsm/functions/fix_mcb.sh   | 2 +-
 lgsm/functions/fix_onset.sh | 2 +-
 lgsm/functions/fix_rw.sh    | 2 +-
 lgsm/functions/fix_sdtd.sh  | 2 +-
 lgsm/functions/fix_sof2.sh  | 2 +-
 lgsm/functions/fix_unt.sh   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lgsm/functions/fix_ins.sh b/lgsm/functions/fix_ins.sh
index e26d501da..8bd3f310b 100644
--- a/lgsm/functions/fix_ins.sh
+++ b/lgsm/functions/fix_ins.sh
@@ -9,7 +9,7 @@ local commandaction="Fix"
 
 # Fixes: ./srcds_linux: error while loading shared libraries: libtier0.so: cannot open shared object file: No such file or directory.
 
-export LD_LIBRARY_PATH=${serverfiles}:${serverfiles}/bin:${LD_LIBRARY_PATH}
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${serverfiles}:${serverfiles}/bin"
 
 # Fixes: issue #529 - gamemode not passed to debug or start.
 
diff --git a/lgsm/functions/fix_mcb.sh b/lgsm/functions/fix_mcb.sh
index e5a919dbc..5352fdee8 100644
--- a/lgsm/functions/fix_mcb.sh
+++ b/lgsm/functions/fix_mcb.sh
@@ -8,4 +8,4 @@ local modulename="FIX"
 local commandaction="Fix"
 
 # official docs state that the server should be started with: LD_LIBRARY_PATH=. ./bedrock_server
-export LD_LIBRARY_PATH="${serverfiles}:$LD_LIBRARY_PATH"
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${serverfiles}"
diff --git a/lgsm/functions/fix_onset.sh b/lgsm/functions/fix_onset.sh
index 24ab62132..299e448fa 100644
--- a/lgsm/functions/fix_onset.sh
+++ b/lgsm/functions/fix_onset.sh
@@ -8,7 +8,7 @@ local modulename="FIX"
 local commandaction="Fix"
 local function_selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
 
-export LD_LIBRARY_PATH="${serverfiles}:$LD_LIBRARY_PATH"
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${serverfiles}"
 
 # Fixes: Failed loading "mariadb": libmariadbclient.so.18: cannot open shared object file: No such file or directory
 # Issue only occures on CentOS as libmariadbclient.so.18 is called libmariadb.so.3 on CentOS.
diff --git a/lgsm/functions/fix_rw.sh b/lgsm/functions/fix_rw.sh
index 7cf5a6b12..73cafcf2e 100644
--- a/lgsm/functions/fix_rw.sh
+++ b/lgsm/functions/fix_rw.sh
@@ -7,4 +7,4 @@
 local modulename="FIX"
 local commandaction="Fix"
 
-export LD_LIBRARY_PATH="${serverfiles}/linux64:${serverfiles}:$LD_LIBRARY_PATH"
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${serverfiles}:${serverfiles}/linux64"
diff --git a/lgsm/functions/fix_sdtd.sh b/lgsm/functions/fix_sdtd.sh
index b04b1fca7..005fb8f6c 100644
--- a/lgsm/functions/fix_sdtd.sh
+++ b/lgsm/functions/fix_sdtd.sh
@@ -7,4 +7,4 @@
 local modulename="FIX"
 local commandaction="Fix"
 
-export LD_LIBRARY_PATH="${serverfiles}"
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${serverfiles}"
diff --git a/lgsm/functions/fix_sof2.sh b/lgsm/functions/fix_sof2.sh
index 3ad769767..11af88522 100644
--- a/lgsm/functions/fix_sof2.sh
+++ b/lgsm/functions/fix_sof2.sh
@@ -8,4 +8,4 @@ local modulename="FIX"
 local commandaction="Fix"
 
 # Fixes: error while loading shared libraries: libcxa.so.1
-export LD_LIBRARY_PATH=":$LD_LIBRARY_PATH"
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${serverfiles}"
diff --git a/lgsm/functions/fix_unt.sh b/lgsm/functions/fix_unt.sh
index f040b77c6..2c27e2f31 100644
--- a/lgsm/functions/fix_unt.sh
+++ b/lgsm/functions/fix_unt.sh
@@ -8,4 +8,4 @@ local modulename="FIX"
 local commandaction="Fix"
 
 # steamclient.so: cannot open shared object file: No such file or directory
-export LD_LIBRARY_PATH="${serverfiles}/linux64:${serverfiles}:$LD_LIBRARY_PATH"
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${serverfiles}:${serverfiles}/linux64"