Merge branch 'hotfix/180313-teamspeak3' into develop

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

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
@@ -57,9 +57,9 @@ fi
 
 ## License
 fn_script_log "Accepting ts3server license:  ${executabledir}/LICENSE"
-fn_print_info_nl "Accepting TeamSpeak license:"
+fn_print_information_nl "Accepting TeamSpeak license:"
-fn_print_info_nl " * ${executabledir}/LICENSE"
+echo " * ${executabledir}/LICENSE"
-sleep 3
+sleep 1
 touch "${executabledir}/.ts3server_license_accepted"
 
 ## Get privilege key

lgsm/functions/update_ts3.sh

@@ -87,12 +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}"
 	# Checks if availablebuild variable has been set
-	if [ -z "${availablebuild}" ]; 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"
@@ -210,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"