From d59bd57d44e820b355b4280756213b2a3962ba01 Mon Sep 17 00:00:00 2001 From: lrob Date: Fri, 5 Feb 2016 02:23:34 +0100 Subject: [PATCH 1/5] fix ts3 update --- functions/install_ts3.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/functions/install_ts3.sh b/functions/install_ts3.sh index f90f91073..27598ac56 100644 --- a/functions/install_ts3.sh +++ b/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}" From 54efa40e654db87478c1bd9c260e69e2578017ad Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 5 Feb 2016 11:45:41 +0000 Subject: [PATCH 2/5] changed to and instead of or --- functions/check.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/check.sh b/functions/check.sh index 0d919b8ab..101544b55 100644 --- a/functions/check.sh +++ b/functions/check.sh @@ -21,7 +21,7 @@ array_contains () { check_root.sh -if [ "${function_selfname}" != "command_install.sh" ]||[ "${function_selfname}" != "update_functions.sh" ]; then +if [ "${function_selfname}" != "command_install.sh" ] && [ "${function_selfname}" != "update_functions.sh" ]; then check_systemdir.sh fi From 965bbfe9f2079bd95a76260d91ca97144ca67de6 Mon Sep 17 00:00:00 2001 From: lrob Date: Fri, 5 Feb 2016 16:49:44 +0100 Subject: [PATCH 3/5] Updated wrong server architecture method Now matching install method --- functions/update_check.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/functions/update_check.sh b/functions/update_check.sh index ece46fb88..6ae3dbd9b 100644 --- a/functions/update_check.sh +++ b/functions/update_check.sh @@ -208,7 +208,14 @@ 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) +if [ "${arch}" == "x86_64" ]; then + ts3arch="amd64" +elif [ "${arch}" == "i386" ]||[ "${arch}" == "i686" ]; then + ts3arch="x86" +else + fn_printfailure "${arch} is an unsupported architecture" + exit 1 +fi # Gets availablebuild info From 6adbeef4236482c33a086b9b3fb4cafc3c18c116 Mon Sep 17 00:00:00 2001 From: lrob Date: Fri, 5 Feb 2016 16:59:27 +0100 Subject: [PATCH 4/5] Reverted --- functions/update_check.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/functions/update_check.sh b/functions/update_check.sh index 6ae3dbd9b..ece46fb88 100644 --- a/functions/update_check.sh +++ b/functions/update_check.sh @@ -208,14 +208,7 @@ 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 -if [ "${arch}" == "x86_64" ]; then - ts3arch="amd64" -elif [ "${arch}" == "i386" ]||[ "${arch}" == "i686" ]; then - ts3arch="x86" -else - fn_printfailure "${arch} is an unsupported architecture" - exit 1 -fi +ts3arch=$(ls $(find ${filesdir}/ -name 'ts3server_*_*' 2> /dev/null | grep -v 'ts3server_minimal_runscript.sh' | sort | tail -1) | egrep -o '(amd64|x86)' | tail -1) # Gets availablebuild info From 24108fc62582a41c18cecc3ded895566e54c8f55 Mon Sep 17 00:00:00 2001 From: lrob Date: Fri, 5 Feb 2016 17:08:29 +0100 Subject: [PATCH 5/5] get arch the same way as installer --- functions/update_check.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/functions/update_check.sh b/functions/update_check.sh index ece46fb88..d51e16d09 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="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