Daniel Gibbs пре 9 година
родитељ
комит
6a49021878
3 измењених фајлова са 16 додато и 12 уклоњено
  1. 8 0
      lgsm/functions/fix.sh
  2. 3 3
      lgsm/functions/fix_glibc.sh
  3. 5 9
      lgsm/functions/fix_mta.sh

+ 8 - 0
lgsm/functions/fix.sh

@@ -17,6 +17,14 @@ fn_fix_msg_start(){
 	sleep 1
 	sleep 1
 }
 }
 
 
+fn_fix_msg_start_nl(){
+	fn_print_dots "Applying ${fixname} fix: ${gamename}"
+	sleep 1
+	fn_print_info "Applying ${fixname} fix: ${gamename}"
+	fn_script_log_info "Applying ${fixname} fix: ${gamename}"
+	sleep 1
+}
+
 fn_fix_msg_end(){
 fn_fix_msg_end(){
 	if [ $? -ne 0 ]; then
 	if [ $? -ne 0 ]; then
 		fn_print_error_nl "Applying ${fixname} fix: ${gamename}"
 		fn_print_error_nl "Applying ${fixname} fix: ${gamename}"

+ 3 - 3
lgsm/functions/fix_glibc.sh

@@ -46,8 +46,6 @@ do
 	fi
 	fi
 done
 done
 
 
-export LD_LIBRARY_PATH=:"${libdir}"
-
 ## amd64
 ## amd64
 
 
 # libm.so.6
 # libm.so.6
@@ -66,4 +64,6 @@ do
 	if [ "${gamename}" == "${libc_server}" ]; then
 	if [ "${gamename}" == "${libc_server}" ]; then
 		fn_fetch_file_github "lgsm/lib/ubuntu12.04/amd64" "libc.so.6" "${lgsmdir}/lib" "noexecutecmd" "norun" "noforce" "nomd5"
 		fn_fetch_file_github "lgsm/lib/ubuntu12.04/amd64" "libc.so.6" "${lgsmdir}/lib" "noexecutecmd" "norun" "noforce" "nomd5"
 	fi
 	fi
-done
+done
+
+export LD_LIBRARY_PATH=:"${libdir}"

+ 5 - 9
lgsm/functions/fix_mta.sh

@@ -9,16 +9,12 @@ local commandaction="Fix"
 local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
 local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
 
 
 if [ ! -f "${lgsmdir}/lib/libmysqlclient.so.16" ]; then
 if [ ! -f "${lgsmdir}/lib/libmysqlclient.so.16" ]; then
-	fixname="libmysqlclient16 install"
-	fn_fix_msg_start
-	fn_print_warn_nl "libmysqlclient16 not installed. Installing.."
+	fixname="libmysqlclient16"
+	fn_fix_msg_start_nl
 	sleep 1
 	sleep 1
-  fileurl="https://nightly.mtasa.com/files/modules/64/libmysqlclient.so.16"; filedir="${lgsmdir}/lib"; filename="libmysqlclient.so.16"; executecmd="executecmd" run="norun"; force="noforce"; md5="6c188e0f8fb5d7a29f4bc413b9fed6c2"
-  fn_fetch_file "${fileurl}" "${filedir}" "${filename}" "${executecmd}" "${run}" "${force}" "${md5}"
+	fileurl="https://nightly.mtasa.com/files/modules/64/libmysqlclient.so.16"; filedir="${lgsmdir}/lib"; filename="libmysqlclient.so.16"; executecmd="executecmd" run="norun"; force="noforce"; md5="6c188e0f8fb5d7a29f4bc413b9fed6c2"
+	fn_fetch_file "${fileurl}" "${filedir}" "${filename}" "${executecmd}" "${run}" "${force}" "${md5}"
 	fn_fix_msg_end
 	fn_fix_msg_end
 fi
 fi
 
 
-fixname="libmysqlclient16"
-fn_fix_msg_start
-export LD_LIBRARY_PATH=:"${libdir}"
-fn_fix_msg_end
+export LD_LIBRARY_PATH=:"${libdir}"