Daniel Gibbs 10 anni fa
parent
commit
6eece549d6
2 ha cambiato i file con 9 aggiunte e 6 eliminazioni
  1. 9 5
      lgsm/functions/check_glibc.sh
  2. 0 1
      lgsm/functions/fix_glibc.sh

+ 9 - 5
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

+ 0 - 1
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"