From 578b3866b2f9dbcad0fdb0e132bfcc549f500744 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 14 Mar 2018 00:36:20 +0000 Subject: [PATCH 1/4] Fixed version number missing from ts3 download --- lgsm/functions/update_ts3.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lgsm/functions/update_ts3.sh b/lgsm/functions/update_ts3.sh index 9340ff522..8af70cdb2 100644 --- a/lgsm/functions/update_ts3.sh +++ b/lgsm/functions/update_ts3.sh @@ -91,8 +91,9 @@ fn_update_ts3_availablebuild(){ elif [ "${arch}" == "x86" ]; then availablebuild=$(${curlpath} -s 'https://www.teamspeak.com/versions/server.json' | jq -r '.linux.x86.version') fi + ts3_version_number=${availablebuild} # Checks if availablebuild variable has been set - if [ -z "${availablebuild}" ]; then + if [ "${availablebuild}" == "null" ]; then fn_print_fail "Checking for update: teamspeak.com" sleep 0.5 fn_print_fail "Checking for update: teamspeak.com: Not returning version info" From f9e3e0b47801e52e3ad4df189cf7b40bc4a51edb Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 14 Mar 2018 00:46:02 +0000 Subject: [PATCH 2/4] Altered ts3 licence message --- lgsm/functions/command_start.sh | 2 +- lgsm/functions/install_ts3db.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lgsm/functions/command_start.sh b/lgsm/functions/command_start.sh index 2cccfa271..9405e9035 100644 --- a/lgsm/functions/command_start.sh +++ b/lgsm/functions/command_start.sh @@ -42,7 +42,7 @@ fn_start_teamspeak3(){ if [ ! -f "${executabledir}/.ts3server_license_accepted" ]; then fn_script_log "Accepting ts3server license: ${executabledir}/LICENSE" fn_print_info_nl "Accepting TeamSpeak license:" - fn_print_info_nl " * ${executabledir}/LICENSE" + echo " * ${executabledir}/LICENSE" sleep 3 touch "${executabledir}/.ts3server_license_accepted" fi diff --git a/lgsm/functions/install_ts3db.sh b/lgsm/functions/install_ts3db.sh index 66edb34e5..8b5faef25 100644 --- a/lgsm/functions/install_ts3db.sh +++ b/lgsm/functions/install_ts3db.sh @@ -48,7 +48,7 @@ fn_install_ts3db_mariadb(){ if [ -z "${autoinstall}" ]; then echo "" - if fn_prompt_yn "Do you want to use MariaDB/MySQL instead of sqlite (Database Server including user and database already has to be set up!)?" N; then + if fn_prompt_yn "Do you want to use MariaDB/MySQL instead of sqlite? (DB must be pre-configured)" N; then fn_install_ts3db_mariadb fi else @@ -58,8 +58,8 @@ fi ## License fn_script_log "Accepting ts3server license: ${executabledir}/LICENSE" fn_print_info_nl "Accepting TeamSpeak license:" -fn_print_info_nl " * ${executabledir}/LICENSE" -sleep 3 +echo " * ${executabledir}/LICENSE" +sleep 1 touch "${executabledir}/.ts3server_license_accepted" ## Get privilege key From 266b9c547158236178cba004504fdc3a1db5fa6f Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Wed, 14 Mar 2018 01:55:53 +0100 Subject: [PATCH 3/4] Added double quotes, fixed indentation for ts3 --- lgsm/functions/update_ts3.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lgsm/functions/update_ts3.sh b/lgsm/functions/update_ts3.sh index 8af70cdb2..2e33c9203 100644 --- a/lgsm/functions/update_ts3.sh +++ b/lgsm/functions/update_ts3.sh @@ -87,13 +87,13 @@ fi fn_update_ts3_availablebuild(){ # Gets latest build info. if [ "${arch}" == "x86_64" ]; then - availablebuild=$(${curlpath} -s 'https://www.teamspeak.com/versions/server.json' | jq -r '.linux.x86_64.version') + availablebuild="$(${curlpath} -s 'https://www.teamspeak.com/versions/server.json' | jq -r '.linux.x86_64.version')" elif [ "${arch}" == "x86" ]; then - availablebuild=$(${curlpath} -s 'https://www.teamspeak.com/versions/server.json' | jq -r '.linux.x86.version') + availablebuild="$(${curlpath} -s 'https://www.teamspeak.com/versions/server.json' | jq -r '.linux.x86.version')" fi - ts3_version_number=${availablebuild} + ts3_version_number="${availablebuild}" # Checks if availablebuild variable has been set - if [ "${availablebuild}" == "null" ]; then + if [ -z "${availablebuild}" ]||[ "${availablebuild}" == "null" ]; then fn_print_fail "Checking for update: teamspeak.com" sleep 0.5 fn_print_fail "Checking for update: teamspeak.com: Not returning version info" @@ -211,7 +211,7 @@ if [ "${installer}" == "1" ]; then else fn_update_ts3_availablebuild_legacy fi - fn_update_ts3_dl + fn_update_ts3_dl else # Checks for server update from teamspeak.com using a mirror dl.4players.de. fn_print_dots "Checking for update: teamspeak.com" From 6b690781e5faf949caad5ae62ffb897a35f83cef Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 14 Mar 2018 12:26:04 +0000 Subject: [PATCH 4/4] Changed message to Information --- lgsm/functions/install_ts3db.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/install_ts3db.sh b/lgsm/functions/install_ts3db.sh index 8b5faef25..966276f10 100644 --- a/lgsm/functions/install_ts3db.sh +++ b/lgsm/functions/install_ts3db.sh @@ -57,7 +57,7 @@ fi ## License fn_script_log "Accepting ts3server license: ${executabledir}/LICENSE" -fn_print_info_nl "Accepting TeamSpeak license:" +fn_print_information_nl "Accepting TeamSpeak license:" echo " * ${executabledir}/LICENSE" sleep 1 touch "${executabledir}/.ts3server_license_accepted"