From 7889c6df2e4da75157395c3449f4a545bc5ce765 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 20 Feb 2018 22:29:19 +0100 Subject: [PATCH 1/5] accepting license by default --- 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 c2bda5850..79eb97013 100644 --- a/lgsm/functions/install_ts3db.sh +++ b/lgsm/functions/install_ts3db.sh @@ -63,6 +63,6 @@ sleep 1 echo "IMPORANT! Save these details for later." sleep 1 cd "${executabledir}" -./ts3server_startscript.sh start inifile=ts3-server.ini +./ts3server_startscript.sh start inifile=ts3-server.ini license_accepted=1 sleep 5 ./ts3server_startscript.sh stop From f45e765b1c6b39c1956d110403b19be9717139e8 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 20 Feb 2018 22:39:46 +0100 Subject: [PATCH 2/5] Added ts3 license --- lgsm/functions/command_start.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lgsm/functions/command_start.sh b/lgsm/functions/command_start.sh index 6bad48141..eae0d2a11 100644 --- a/lgsm/functions/command_start.sh +++ b/lgsm/functions/command_start.sh @@ -38,6 +38,14 @@ fn_start_teamspeak3(){ fi # Create lockfile date > "${rootdir}/${lockselfname}" + # Accept license + if [ ! -f "${executabledir}/.ts3server_license_accepted" ]; then + fn_script_log "Creating License acceptation file, which means you accept TeamSpeak License if you keep using it" + fn_print_info_nl "Creating License acceptation file, which means you accept TeamSpeak License if you keep using it" + fn_print_info_nl " * You can review the TeamSpeak License in ${executabledir}/LICENSE" + sleep 3 + touch "${executabledir}/.ts3server_license_accepted" + fi cd "${executabledir}" if [ "${ts3serverpass}" == "1" ]; then ./ts3server_startscript.sh start serveradmin_password="${newpassword}" inifile="${servercfgfullpath}" > /dev/null 2>&1 From 658876e6d728007d6466eff396739dc7020f888a Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 27 Feb 2018 00:51:39 +0100 Subject: [PATCH 3/5] touch method for accepting license --- lgsm/functions/install_ts3db.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lgsm/functions/install_ts3db.sh b/lgsm/functions/install_ts3db.sh index 79eb97013..eeb136382 100644 --- a/lgsm/functions/install_ts3db.sh +++ b/lgsm/functions/install_ts3db.sh @@ -62,7 +62,14 @@ echo "=================================" sleep 1 echo "IMPORANT! Save these details for later." sleep 1 +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 " * You can review the TeamSpeak License in ${executabledir}/LICENSE" + sleep 3 + touch "${executabledir}/.ts3server_license_accepted" +fi cd "${executabledir}" -./ts3server_startscript.sh start inifile=ts3-server.ini license_accepted=1 +./ts3server_startscript.sh start inifile=ts3-server.ini sleep 5 ./ts3server_startscript.sh stop From ec82ffff413de240f3306f9566288070b57728e4 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 27 Feb 2018 01:08:19 +0100 Subject: [PATCH 4/5] can't touch this --- lgsm/functions/install_ts3db.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lgsm/functions/install_ts3db.sh b/lgsm/functions/install_ts3db.sh index eeb136382..66edb34e5 100644 --- a/lgsm/functions/install_ts3db.sh +++ b/lgsm/functions/install_ts3db.sh @@ -55,6 +55,13 @@ else fn_print_warning_nl "./${selfname} auto-install is uses sqlite. For MariaDB/MySQL use ./${selfname} install" 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 +touch "${executabledir}/.ts3server_license_accepted" + ## Get privilege key echo "" echo "Getting privilege key" @@ -62,13 +69,6 @@ echo "=================================" sleep 1 echo "IMPORANT! Save these details for later." sleep 1 -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 " * You can review the TeamSpeak License in ${executabledir}/LICENSE" - sleep 3 - touch "${executabledir}/.ts3server_license_accepted" -fi cd "${executabledir}" ./ts3server_startscript.sh start inifile=ts3-server.ini sleep 5 From 8dd06e59f63af3f93e1c5532e18672d8cd71f12d Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 27 Feb 2018 01:09:08 +0100 Subject: [PATCH 5/5] Better way to say it --- lgsm/functions/command_start.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lgsm/functions/command_start.sh b/lgsm/functions/command_start.sh index eae0d2a11..2cccfa271 100644 --- a/lgsm/functions/command_start.sh +++ b/lgsm/functions/command_start.sh @@ -40,9 +40,9 @@ fn_start_teamspeak3(){ date > "${rootdir}/${lockselfname}" # Accept license if [ ! -f "${executabledir}/.ts3server_license_accepted" ]; then - fn_script_log "Creating License acceptation file, which means you accept TeamSpeak License if you keep using it" - fn_print_info_nl "Creating License acceptation file, which means you accept TeamSpeak License if you keep using it" - fn_print_info_nl " * You can review the TeamSpeak License in ${executabledir}/LICENSE" + fn_script_log "Accepting ts3server license: ${executabledir}/LICENSE" + fn_print_info_nl "Accepting TeamSpeak license:" + fn_print_info_nl " * ${executabledir}/LICENSE" sleep 3 touch "${executabledir}/.ts3server_license_accepted" fi