From b395f198b36dfbfc45d1563d91bb91c833d00151 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Wed, 4 Dec 2013 21:29:44 +0000
Subject: [PATCH] Applied steamclient.so fix to homedir

Applied steamclient.so fix to homedir rather than the rootdir.
Also removed some code from a merge error.
---
 CounterStrike/csserver                  | 3 ---
 CounterStrikeGlobalOffensive/csgoserver | 6 +++---
 CounterStrikeSource/cssserver           | 6 +++---
 DayOfDefeatSource/dodsserver            | 6 +++---
 HalfLife2Deathmatch/hl2dmserver         | 6 +++---
 Left4Dead2/l4d2server                   | 6 +++---
 NoMoreRoomInHell/nmrihserver            | 6 +++---
 7 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/CounterStrike/csserver b/CounterStrike/csserver
index a19887145..94fdd2789 100644
--- a/CounterStrike/csserver
+++ b/CounterStrike/csserver
@@ -571,12 +571,9 @@ echo "================================="
 	sleep 1
 	echo ""
 	echo "Creating server.cfg"
-<<<<<<< HEAD
 	touch ${filesdir}/cstrike/cfg/server.cfg
 	echo "exec ${servicename}.cfg" > ${filesdir}/cstrike/cfg/server.cfg
-=======
 	echo "exec ${servicename}.cfg" >> ${filesdir}/cstrike/server.cfg
->>>>>>> a46f23fd4b86e3ec69a9db2cb61c76f4977a8678
 	sleep 1
 	echo "Creating default config file:"
 	sleep 0.5
diff --git a/CounterStrikeGlobalOffensive/csgoserver b/CounterStrikeGlobalOffensive/csgoserver
index f93ebcd02..91570393d 100644
--- a/CounterStrikeGlobalOffensive/csgoserver
+++ b/CounterStrikeGlobalOffensive/csgoserver
@@ -595,9 +595,9 @@ echo "================================="
 	sleep 1
 	echo ""
 	echo "Applying steamclient.so fix"
-	mkdir -v ${rootdir}/.steam
-	mkdir -v ${rootdir}/.steam/sdk32
-	cp -v ${filesdir}/bin/steamclient.so ${rootdir}/.steam/sdk32/steamclient.so
+	mkdir -v ${HOME}/.steam
+	mkdir -v ${HOME}/.steam/sdk32
+	cp -v ${filesdir}/steamclient.so ${HOME}/.steam/sdk32/steamclient.so
 	sleep 1
 	fn_header
 	fn_details
diff --git a/CounterStrikeSource/cssserver b/CounterStrikeSource/cssserver
index 805a804c4..5210ff6f9 100644
--- a/CounterStrikeSource/cssserver
+++ b/CounterStrikeSource/cssserver
@@ -595,9 +595,9 @@ echo "================================="
 	sleep 1
 	echo ""
 	echo "Applying steamclient.so fix"
-	mkdir -v ${rootdir}/.steam
-	mkdir -v ${rootdir}/.steam/sdk32
-	cp -v ${filesdir}/bin/steamclient.so ${rootdir}/.steam/sdk32/steamclient.so
+	mkdir -v ${HOME}/.steam
+	mkdir -v ${HOME}/.steam/sdk32
+	cp -v ${filesdir}/steamclient.so ${HOME}/.steam/sdk32/steamclient.so
 	sleep 1
 	fn_header
 	fn_details
diff --git a/DayOfDefeatSource/dodsserver b/DayOfDefeatSource/dodsserver
index 20e8814c9..a851d1c5f 100644
--- a/DayOfDefeatSource/dodsserver
+++ b/DayOfDefeatSource/dodsserver
@@ -594,9 +594,9 @@ echo "================================="
 	sleep 1
 	echo ""
 	echo "Applying steamclient.so fix"
-	mkdir -v ${rootdir}/.steam
-	mkdir -v ${rootdir}/.steam/sdk32
-	cp -v ${filesdir}/bin/steamclient.so ${rootdir}/.steam/sdk32/steamclient.so
+	mkdir -v ${HOME}/.steam
+	mkdir -v ${HOME}/.steam/sdk32
+	cp -v ${filesdir}/steamclient.so ${HOME}/.steam/sdk32/steamclient.so
 	sleep 1
 	fn_header
 	fn_details
diff --git a/HalfLife2Deathmatch/hl2dmserver b/HalfLife2Deathmatch/hl2dmserver
index 8cef4dbbd..ebf5f1ab5 100644
--- a/HalfLife2Deathmatch/hl2dmserver
+++ b/HalfLife2Deathmatch/hl2dmserver
@@ -595,9 +595,9 @@ echo "================================="
 	sleep 1
 	echo ""
 	echo "Applying steamclient.so fix"
-	mkdir -v ${rootdir}/.steam
-	mkdir -v ${rootdir}/.steam/sdk32
-	cp -v ${filesdir}/bin/steamclient.so ${rootdir}/.steam/sdk32/steamclient.so
+	mkdir -v ${HOME}/.steam
+	mkdir -v ${HOME}/.steam/sdk32
+	cp -v ${filesdir}/steamclient.so ${HOME}/.steam/sdk32/steamclient.so
 	sleep 1
 	fn_header
 	fn_details
diff --git a/Left4Dead2/l4d2server b/Left4Dead2/l4d2server
index fc7b2fc44..e5865ae83 100644
--- a/Left4Dead2/l4d2server
+++ b/Left4Dead2/l4d2server
@@ -595,9 +595,9 @@ echo "================================="
 	sleep 1
 	echo ""
 	echo "Applying steamclient.so fix"
-	mkdir -v ${rootdir}/.steam
-	mkdir -v ${rootdir}/.steam/sdk32
-	cp -v ${filesdir}/bin/steamclient.so ${rootdir}/.steam/sdk32/steamclient.so
+	mkdir -v ${HOME}/.steam
+	mkdir -v ${HOME}/.steam/sdk32
+	cp -v ${filesdir}/steamclient.so ${HOME}/.steam/sdk32/steamclient.so
 	sleep 1
 	fn_header
 	fn_details
diff --git a/NoMoreRoomInHell/nmrihserver b/NoMoreRoomInHell/nmrihserver
index a5f4d8097..187958d5b 100644
--- a/NoMoreRoomInHell/nmrihserver
+++ b/NoMoreRoomInHell/nmrihserver
@@ -599,9 +599,9 @@ echo "================================="
 	sleep 1
 	echo ""
 	echo "Applying steamclient.so fix"
-	mkdir -v ${rootdir}/.steam
-	mkdir -v ${rootdir}/.steam/sdk32
-	cp -v ${filesdir}/srcds/bin/steamclient.so ${rootdir}/.steam/sdk32/steamclient.so
+	mkdir -v ${HOME}/.steam
+	mkdir -v ${HOME}/.steam/sdk32
+	cp -v ${filesdir}/steamclient.so ${HOME}/.steam/sdk32/steamclient.so
 	sleep 1
 	fn_header
 	fn_details