From 6a49021878d26434f3b54c4211fec340e93da50c Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 27 Jan 2017 14:48:00 +0000 Subject: [PATCH] Minor changes to UI --- lgsm/functions/fix.sh | 8 ++++++++ lgsm/functions/fix_glibc.sh | 6 +++--- lgsm/functions/fix_mta.sh | 14 +++++--------- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/lgsm/functions/fix.sh b/lgsm/functions/fix.sh index 327fcccf9..5bac281a3 100644 --- a/lgsm/functions/fix.sh +++ b/lgsm/functions/fix.sh @@ -17,6 +17,14 @@ fn_fix_msg_start(){ 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(){ if [ $? -ne 0 ]; then fn_print_error_nl "Applying ${fixname} fix: ${gamename}" diff --git a/lgsm/functions/fix_glibc.sh b/lgsm/functions/fix_glibc.sh index 8580e3e71..d03b2c41e 100644 --- a/lgsm/functions/fix_glibc.sh +++ b/lgsm/functions/fix_glibc.sh @@ -46,8 +46,6 @@ do fi done -export LD_LIBRARY_PATH=:"${libdir}" - ## amd64 # libm.so.6 @@ -66,4 +64,6 @@ do if [ "${gamename}" == "${libc_server}" ]; then fn_fetch_file_github "lgsm/lib/ubuntu12.04/amd64" "libc.so.6" "${lgsmdir}/lib" "noexecutecmd" "norun" "noforce" "nomd5" fi -done \ No newline at end of file +done + +export LD_LIBRARY_PATH=:"${libdir}" \ No newline at end of file diff --git a/lgsm/functions/fix_mta.sh b/lgsm/functions/fix_mta.sh index 6bf11dbc9..7347201d9 100644 --- a/lgsm/functions/fix_mta.sh +++ b/lgsm/functions/fix_mta.sh @@ -9,16 +9,12 @@ local commandaction="Fix" local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" 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 - 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 fi -fixname="libmysqlclient16" -fn_fix_msg_start -export LD_LIBRARY_PATH=:"${libdir}" -fn_fix_msg_end +export LD_LIBRARY_PATH=:"${libdir}" \ No newline at end of file