From e05a42daae1ae0b4af1fe351a7224b061bac4918 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 6 Feb 2016 14:39:51 +0000 Subject: [PATCH 1/2] Added unset updateonstart to resolve updater looping updateonstart was causing the updater to loop if on. update now removes the updateonstart var to prevent it from looping --- functions/update_check.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/functions/update_check.sh b/functions/update_check.sh index d51e16d09..773c88b25 100644 --- a/functions/update_check.sh +++ b/functions/update_check.sh @@ -2,7 +2,7 @@ # LGSM update_check.sh function # Author: Daniel Gibbs # Website: http://gameservermanagers.com -lgsm_version="050216" +lgsm_version="060216" # Description: Checks if a server update is available. @@ -89,6 +89,7 @@ if [ "${requestrestart}" -ge "1" ]; then sleep 1 echo -ne "\n" tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -Ec "^${servicename}:") + unset updateonstart if [ "${tmuxwc}" -eq 1 ]; then command_stop.sh update_dl.sh @@ -156,6 +157,7 @@ if [ "${currentbuild}" != "${availablebuild}" ]; then fn_scriptlog "${currentbuild} > ${availablebuild}" tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -Ec "^${servicename}:") + unset updateonstart if [ "${tmuxwc}" -eq 1 ]; then command_stop.sh update_dl.sh @@ -283,6 +285,7 @@ if [ "${currentbuilddigit}" -ne "${availablebuilddigit}" ]; then fn_scriptlog "Current build: ${currentbuild}" fn_scriptlog "Available build: ${availablebuild}" fn_scriptlog "${currentbuild} > ${availablebuild}" + unset updateonstart info_ts3status.sh if [ "${ts3status}" = "No server running (ts3server.pid is missing)" ]; then update_dl.sh From 339a5198ce8f2fb0f1c285440857b073b9fb30a2 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 6 Feb 2016 18:59:21 +0000 Subject: [PATCH 2/2] fix issue #676 no longer trys to install lib32gcc1 if 32 bit --- functions/check_deps.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/functions/check_deps.sh b/functions/check_deps.sh index 1e2e99fee..3f9312024 100644 --- a/functions/check_deps.sh +++ b/functions/check_deps.sh @@ -2,7 +2,7 @@ # LGSM check_deps.sh function # Author: Daniel Gibbs # Website: http://gameservermanagers.com -lgsm_version="310116" +lgsm_version="060216" # Description: Checks that the requires dependencies are installed for LGSM. @@ -118,9 +118,13 @@ if [ -n "$(command -v dpkg-query)" ]; then array_deps_required+=( tmux ) fi - # All servers excelts ts3 & mumble require libstdc++6,lib32gcc1 + # All servers except ts3 & mumble require libstdc++6, lib32gcc1 if [ "${executable}" != "./ts3server_startscript.sh" ]||[ "${executable}" != "./murmur.x86" ]; then - array_deps_required+=( lib32gcc1 libstdc++6:i386 ) + if [ "${arch}" == "x86_64" ]; then + array_deps_required+=( lib32gcc1 libstdc++6:i386 ) + else + array_deps_required+=( libstdc++6:i386 ) + fi fi # Game Specific requirements @@ -164,7 +168,7 @@ elif [ -n "$(command -v yum)" ]; then array_deps_required+=( tmux ) fi - # All servers excelts ts3 & mumble require libstdc++6,lib32gcc1 + # All servers excelts ts3 & mumble require glibc.i686 libstdc++.i686 if [ "${executable}" != "./ts3server_startscript.sh" ]||[ "${executable}" != "./murmur.x86" ]; then array_deps_required+=( glibc.i686 libstdc++.i686 ) fi