Просмотр исходного кода

Merge remote-tracking branch 'refs/remotes/origin/master' into dlmanage

Daniel Gibbs 10 лет назад
Родитель
Сommit
f8594dd13d
2 измененных файлов с 12 добавлено и 5 удалено
  1. 8 4
      functions/check_deps.sh
  2. 4 1
      functions/update_check.sh

+ 8 - 4
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

+ 4 - 1
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