merged install fixes to fix.sh

functions/command_install.sh

@@ -23,28 +23,18 @@ elif [ "${gamename}" == "Teamspeak 3" ]; then
 elif [ ! -z "${appid}" ]; then
 	install_steamcmd.sh
 	install_serverfiles.sh
-	fix.sh
 fi
 
 # Configuration
-fix_glibc.sh
+fix.sh
 install_logs.sh
 install_gsquery.sh
 install_config.sh
 if [ "${gamename}" == "Counter Strike: Global Offensive" ]; then
 	install_gslt.sh
-	fix_csgo.sh
 elif [ "${gamename}" == "Teamspeak 3" ]; then
 	install_ts3db.sh
 elif [ "${gamename}" == "Team Fortress 2" ]; then
 	install_gslt.sh
-elif [ "${gamename}" == "Killing Floor" ]; then
-	install_fix_kf.sh
-elif [ "${gamename}" == "Red Orchestra: Ostfront 41-45" ]; then
-	install_fix_ro.sh
-elif [ "${gamename}" == "Unreal Tournament 2004" ]; then
-	install_fix_ut2k4.sh
-elif [ "${gamename}" == "Unreal Tournament 99" ]; then
-	install_fix_ut99.sh
 fi
 install_complete.sh

functions/core_functions.sh

@@ -190,6 +190,26 @@ functionfile="${FUNCNAME}"
 fn_runfunction
 }
 
+fix_glibc.sh(){
+functionfile="${FUNCNAME}"
+fn_runfunction
+}
+
+fix_ro.sh(){
+functionfile="${FUNCNAME}"
+fn_runfunction
+}
+
+fix_kf.sh(){
+functionfile="${FUNCNAME}"
+fn_runfunction
+}
+
+fix_ut2k4.sh(){
+functionfile="${FUNCNAME}"
+fn_runfunction
+}
+
 
 # Info
 
@@ -279,11 +299,6 @@ functionfile="${FUNCNAME}"
 fn_runfunction
 }
 
-fix_glibc.sh(){
-functionfile="${FUNCNAME}"
-fn_runfunction
-}
-
 install_gsquery.sh(){
 functionfile="${FUNCNAME}"
 fn_runfunction
@@ -299,11 +314,6 @@ functionfile="${FUNCNAME}"
 fn_runfunction
 }
 
-install_fix_kf.sh(){
-functionfile="${FUNCNAME}"
-fn_runfunction
-}
-
 install_logs.sh(){
 functionfile="${FUNCNAME}"
 fn_runfunction
@@ -314,11 +324,6 @@ functionfile="${FUNCNAME}"
 fn_runfunction
 }
 
-install_fix_ro.sh(){
-functionfile="${FUNCNAME}"
-fn_runfunction
-}
-
 install_serverdir.sh(){
 functionfile="${FUNCNAME}"
 fn_runfunction
@@ -333,11 +338,6 @@ functionfile="${FUNCNAME}"
 fn_runfunction
 }
 
-install_fix_steam.sh(){
-functionfile="${FUNCNAME}"
-fn_runfunction
-}
-
 install_ts3.sh(){
 functionfile="${FUNCNAME}"
 fn_runfunction
@@ -353,11 +353,6 @@ functionfile="${FUNCNAME}"
 fn_runfunction
 }
 
-install_fix_ut2k4.sh(){
-functionfile="${FUNCNAME}"
-fn_runfunction
-}
-
 install_ut2k4_key.sh(){
 functionfile="${FUNCNAME}"
 fn_runfunction
@@ -373,7 +368,7 @@ functionfile="${FUNCNAME}"
 fn_runfunction
 }
 
-install_fix_ut99.sh(){
+fix_ut99.sh(){
 functionfile="${FUNCNAME}"
 fn_runfunction
 }

functions/fix.sh

@@ -2,7 +2,7 @@
 # LGSM fix.sh function
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
-lgsm_version="291215"
+lgsm_version="301215"
 
 # Description: Overall function for managing fixes.
 # Runs functions that will fix an issue.
@@ -18,4 +18,17 @@ elif [ "${gamename}" == "Insurgency" ]; then
 	fix_ins.sh
 elif [ "${gamename}" == "ARMA 3" ]; then
 	fix_arma3.sh	
-fi
+fi
+
+if [ "${function_selfname}" == "command_install.sh" ]; then
+	fix_glibc.sh
+	if [ "${gamename}" == "Killing Floor" ]; then
+		fix_kf.sh
+	elif [ "${gamename}" == "Red Orchestra: Ostfront 41-45" ]; then
+		fix_ro.sh
+	elif [ "${gamename}" == "Unreal Tournament 2004" ]; then
+		fix_ut2k4.sh
+	elif [ "${gamename}" == "Unreal Tournament 99" ]; then
+		fix_ut99.sh
+	fi
+fi

functions/install_fix_kf.sh → functions/fix_kf.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# LGSM install_fix_kf.sh function
+# LGSM fix_kf.sh function
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
 lgsm_version="271215"

functions/install_fix_ro.sh → functions/fix_ro.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# LGSM install_fix_ro.sh function
+# LGSM fix_ro.sh function
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
 lgsm_version="271215"

functions/install_fix_ut2k4.sh → functions/fix_ut2k4.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# LGSM install_fix_ut2k4.sh function
+# LGSM fix_ut2k4.sh function
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
 lgsm_version="271215"

functions/install_fix_ut99.sh → functions/fix_ut99.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# LGSM install_fix_ut99.sh function
+# LGSM fix_ut99.sh function
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
 lgsm_version="271215"

functions/install_fix_steam.sh

@@ -1,43 +0,0 @@
-#!/bin/bash
-# LGSM install_fix_steam.sh function
-# Author: Daniel Gibbs
-# Website: http://gameservermanagers.com
-lgsm_version="271215"
-
-fn_steamclientfix(){
-echo ""
-echo "Applying steamclient.so fix"
-echo "================================="
-sleep 1
-# Fixes: [S_API FAIL] SteamAPI_Init() failed; unable to locate a running instance of Steam,or a local steamclient.so.
-mkdir -pv "${HOME}/.steam/sdk32"
-cp -v "${rootdir}/steamcmd/linux32/steamclient.so" "${HOME}/.steam/sdk32/steamclient.so"
-sleep 1
-}
-
-# Server specific
-fn_libsteamfix(){
-echo ""
-echo "Applying libsteam.so and steamclient.so fixes"
-echo "================================="
-sleep 1
-if [ "${gamename}" == "Garry's Mod" ]; then
-	# Fixes: .steam/sdk32/libsteam.so: cannot open shared object file: No such file or directory
-	mkdir -pv "${HOME}/.steam/sdk32"
-	cp -v "${filesdir}/bin/libsteam.so" "${HOME}/.steam/sdk32/libsteam.so"
-elif [ "${gamename}" == "Serious Sam 3: BFE" ]; then
-	# Fixes: .steam/bin32/libsteam.so: cannot open shared object file: No such file or directory
-	mkdir -pv "${HOME}/.steam/bin32"
-	cp -v "${filesdir}/Bin/libsteam.so" "${HOME}/.steam/bin32/libsteam.so"
-elif [ "${gamename}" == "Hurtworld" ]; then
-	# Fixes: [S_API FAIL] SteamAPI_Init() failed; unable to locate a running instance of Steam, or a local steamclient.so.
-	cp -v "${rootdir}/steamcmd/linux32/steamclient.so" "${filesdir}/Hurtworld_Data/Plugins/x86/steamclient.so"
-	cp -v "${rootdir}/steamcmd/linux32/steamclient.so" "${filesdir}/Hurtworld_Data/Plugins/x86_64/steamclient.so"
-fi
-sleep 1
-}
-
-fn_steamclientfix
-if [ "${gamename}" == "Garry's Mod" ]||[ "${gamename}" == "Serious Sam 3: BFE" ]||[ "${gamename}" == "Hurtworld" ]; then
-	fn_libsteamfix
-fi