From 6eece549d64b062d3777e7c1bdfb8a01d5f8602e Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 8 May 2016 20:25:10 +0100
Subject: [PATCH] glibc checks

---
 lgsm/functions/check_glibc.sh | 14 +++++++++-----
 lgsm/functions/fix_glibc.sh   |  1 -
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/lgsm/functions/check_glibc.sh b/lgsm/functions/check_glibc.sh
index 1bbfbaed4..a47e735aa 100644
--- a/lgsm/functions/check_glibc.sh
+++ b/lgsm/functions/check_glibc.sh
@@ -9,15 +9,19 @@ lgsm_version="020116"
 info_glibc.sh
 info_distro.sh
 
-if [ "$(printf '%s\n${glibcrequired}\n' ${glibcversion} | sort -V | head -n 1)" == "${glibcrequired}" ]; then
-	if [ "${glibcfix}" != "yes" ]; then 
+if [ "$(printf '%s\n'${glibcrequired}'\n' ${glibcversion} | sort -V | head -n 1)" != "${glibcrequired}" ]; then
+	if [ "${glibcfix}" == "yes" ]; then 
+		fn_print_info_nl "Glibc fix: Using Glibc fix"
+		echo "	* glibc required: ${glibcrequired}"
+		echo "	* glibc installed: ${glibcversion}"
+		export LD_LIBRARY_PATH=:"${libdir}"
+	else
 		fn_print_warn_nl "Glibc fix: No Glibc fix available!"
 		echo -en "\n"
-		echo "	* glibc required: $glibcrequired"
-		echo "	* glibc installed: $glibcversion"
+		echo "	* glibc required: ${glibcrequired}"
+		echo "	* glibc installed: ${glibcversion}"
 		echo -en "\n"
 		fn_print_infomation "The game server will probably not work. A distro upgrade is required!"
-		sleep 5
 	fi
 	echo -en "\n"
 fi
\ No newline at end of file
diff --git a/lgsm/functions/fix_glibc.sh b/lgsm/functions/fix_glibc.sh
index f33afa4f9..a70a33cb3 100644
--- a/lgsm/functions/fix_glibc.sh
+++ b/lgsm/functions/fix_glibc.sh
@@ -25,7 +25,6 @@ do
 	fi	
 done
 
-glibcversion="$(ldd --version | sed 's/.* //;q')"
 if [ "$(printf '%s\n'${glibcrequired}'\n' ${glibcversion} | sort -V | head -n 1)" != "${glibcrequired}" ]; then
 	if [ "${glibcfix}" == "yes" ]; then 
 		fn_print_info_nl "Glibc fix: Using Glibc fix"