Răsfoiți Sursa

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

Daniel Gibbs 10 ani în urmă
părinte
comite
08633ade23
2 a modificat fișierele cu 14 adăugiri și 5 ștergeri
  1. 2 2
      functions/install_ts3.sh
  2. 12 3
      functions/update_check.sh

+ 2 - 2
functions/install_ts3.sh

@@ -65,7 +65,7 @@ else
 	exit $?
 fi
 echo -e "copying to ${filesdir}...\c"
-cp -R "${rootdir}/teamspeak3-server_linux-${ts3arch}/"* "${filesdir}" 2> ".${servicename}-cp-error.tmp"
+cp -R "${rootdir}/teamspeak3-server_linux_${ts3arch}/"* "${filesdir}" 2> ".${servicename}-cp-error.tmp"
 local status=$?
 if [ ${status} -eq 0 ]; then
 	echo "OK"
@@ -77,4 +77,4 @@ else
 	exit $?
 fi
 rm -f "teamspeak3-server_linux_${ts3arch}-${ts3_version_number}.tar.bz2"
-rm -rf "${rootdir}/teamspeak3-server_linux-${ts3arch}"
+rm -rf "${rootdir}/teamspeak3-server_linux_${ts3arch}"

+ 12 - 3
functions/update_check.sh

@@ -2,7 +2,7 @@
 # LGSM update_check.sh function
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
-lgsm_version="020216"
+lgsm_version="050216"
 
 # Description: Checks if a server update is available.
 
@@ -208,8 +208,17 @@ fi
 currentbuild=$(cat $(find ./* -name 'ts3server*_0.log' 2> /dev/null | sort | egrep -E -v '${rootdir}/.ts3version' | tail -1) | egrep -o 'TeamSpeak 3 Server ((\.)?[0-9]{1,3}){1,3}\.[0-9]{1,3}' | egrep -o '((\.)?[0-9]{1,3}){1,3}\.[0-9]{1,3}')
 
 # Gets the teamspeak server architecture
-ts3arch=$(ls $(find ${filesdir}/ -name 'ts3server_*_*' 2> /dev/null | grep -v 'ts3server_minimal_runscript.sh' | sort | tail -1) | egrep -o '(amd64|x86)' | tail -1)
-
+info_distro.sh
+if [ "${arch}" == "x86_64" ]; then
+	ts3arch="amd64"
+elif [ "${arch}" == "i386" ]||[ "${arch}" == "i686" ]; then
+	ts3arch="x86"
+else
+	echo ""
+	fn_printfailure "${arch} is an unsupported architecture"
+	exit 1
+fi
+ 
 # Gets availablebuild info
 
 # Grabs all version numbers but not in correct order