From 94149361e6fe13653f445b6d1c9e9ef9775e5f22 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 5 Jan 2016 18:48:45 +0100 Subject: [PATCH 01/14] Added ts3_server_password --- functions/command_ts3_server_password.sh | 71 ++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 functions/command_ts3_server_password.sh diff --git a/functions/command_ts3_server_password.sh b/functions/command_ts3_server_password.sh new file mode 100644 index 000000000..7aee7b9f1 --- /dev/null +++ b/functions/command_ts3_server_password.sh @@ -0,0 +1,71 @@ +#!/bin/bash +# LGSM command_serveradmin_password.sh function +# Author: Daniel Gibbs +# Contributor : UltimateByte +# Website: http://gameservermanagers.com +lgsm_version="030116" + +# Description: Changes TS3 serveradmin password + +local modulename="TS3 Server Password" +function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" + + +fn_serveradmin_password_prompt(){ +fn_printwarn "Initiating TS3 serveradmin password change" +sleep 2 +echo -en "\n" +echo "Changing telnet ServerQuery password" +while true; do + read -p "Continue ? [y/n]" yn + case $yn in + [Yy]* ) break;; + [Nn]* ) exit;; + * ) echo "Please answer yes or no.";; + esac +done + +fn_scriptlog "Initiating serveradmin password change" +echo -n "Enter the new password : " ; read newpassword +fn_scriptlog "New serveradmin password chosen" +} + + +fn_serveradmin_password_set(){ +fn_printdots "Applying new password" +sleep 1 +fn_scriptlog "Starting routine with new password start option" + +./ts3server_startscript.sh start serveradmin_password="${newpassword}" > /dev/null 2>&1 + +info_ts3status.sh +if [ "${ts3status}" = "Server seems to have died" ]||[ "${ts3status}" = "No server running (ts3server.pid is missing)" ]; then + fn_printfailnl "Unable to start ${servername}" + fn_scriptlog "Unable to start ${servername}" + echo -e " Check log files: ${rootdir}/log" + exit 1 +else + fn_printok "${servername} has set a new serveradmin password" + echo -en "\n" + fn_scriptlog "Started ${servername} with new password" +fi +sleep 1 +} + +# Running functions +check.sh +fn_serveradmin_password_prompt +info_ts3status.sh + +if [ "${ts3status}" == "Server is running" ]; then + command_stop.sh + fn_serveradmin_password_set + echo "Server will now restart normally" + sleep 1 + command_stop.sh + command_start.sh +else + fn_serveradmin_password_set + echo -en "\n" + command_stop.sh +fi From 9386317a77bdc24a816aec5215bb2ad5a4a870c7 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 5 Jan 2016 19:16:50 +0100 Subject: [PATCH 02/14] adding ts3 functions --- functions/command_ts3_server_password.sh | 4 ++-- functions/core_functions.sh | 6 +++++- functions/core_getopt.sh | 5 ++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/functions/command_ts3_server_password.sh b/functions/command_ts3_server_password.sh index 7aee7b9f1..bb3803015 100644 --- a/functions/command_ts3_server_password.sh +++ b/functions/command_ts3_server_password.sh @@ -3,7 +3,7 @@ # Author: Daniel Gibbs # Contributor : UltimateByte # Website: http://gameservermanagers.com -lgsm_version="030116" +lgsm_version="050116" # Description: Changes TS3 serveradmin password @@ -68,4 +68,4 @@ else fn_serveradmin_password_set echo -en "\n" command_stop.sh -fi +fi \ No newline at end of file diff --git a/functions/core_functions.sh b/functions/core_functions.sh index 698365058..2f8d41654 100644 --- a/functions/core_functions.sh +++ b/functions/core_functions.sh @@ -2,7 +2,6 @@ # LGSM core_functions.sh function # Author: Daniel Gibbs # Website: http://gameservermanagers.com -lgsm_version="030116" # Description: Defines all functions to allow download and execution of functions using fn_runfunction. # This function is called first before any other function. Without this file other functions would not load. @@ -85,6 +84,11 @@ functionfile="${FUNCNAME}" fn_runfunction } +command_ts3_server_password.sh(){ +functionfile="${FUNCNAME}" +fn_runfunction +} + fn_restart(){ local modulename="Restarting" info_config.sh diff --git a/functions/core_getopt.sh b/functions/core_getopt.sh index 2b90be321..38143b728 100644 --- a/functions/core_getopt.sh +++ b/functions/core_getopt.sh @@ -2,7 +2,7 @@ # LGSM core_getopt.sh function # Author: Daniel Gibbs # Website: http://gameservermanagers.com -lgsm_version="271215" +lgsm_version="050116" # Description: getopt arguments. @@ -90,6 +90,8 @@ case "$getopt" in command_details.sh;; b|backup) command_backup.sh;; + pw|serveradmin-password) + command_ts3_server_password.sh;; dev|dev-debug) command_dev_debug.sh;; i|install) @@ -113,6 +115,7 @@ case "$getopt" in echo -e "\e[34mmonitor\t\e[0mChecks that the server is running." echo -e "\e[34memail-test\t\e[0mSends test monitor email." echo -e "\e[34mdetails\t\e[0mDisplays useful infomation about the server." + echo -e "\e[34mserveradmin-password\t\e[0mChanges TS3 server password." echo -e "\e[34mbackup\t\e[0mCreate archive of the server." echo -e "\e[34minstall\t\e[0mInstall the server." echo -e "\e[34mauto-install\t\e[0mInstall the server, without prompts." From f6abfb26c42f5d86b0bbbe068a63367ac8c24d73 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 5 Jan 2016 19:19:06 +0100 Subject: [PATCH 03/14] readded ts3db, updated date --- functions/core_functions.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/functions/core_functions.sh b/functions/core_functions.sh index 2f8d41654..60a3e4213 100644 --- a/functions/core_functions.sh +++ b/functions/core_functions.sh @@ -2,6 +2,7 @@ # LGSM core_functions.sh function # Author: Daniel Gibbs # Website: http://gameservermanagers.com +lgsm_version="050116" # Description: Defines all functions to allow download and execution of functions using fn_runfunction. # This function is called first before any other function. Without this file other functions would not load. From f08f9a5477407e99491dd269be67f22e02d9369c Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 7 Jan 2016 21:15:26 +0000 Subject: [PATCH 04/14] Shortened the command name Shortened form password to use pass --- ...nd_ts3_server_password.sh => command_ts3_server_pass.sh} | 0 functions/core_functions.sh | 2 +- functions/core_getopt.sh | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-) rename functions/{command_ts3_server_password.sh => command_ts3_server_pass.sh} (100%) diff --git a/functions/command_ts3_server_password.sh b/functions/command_ts3_server_pass.sh similarity index 100% rename from functions/command_ts3_server_password.sh rename to functions/command_ts3_server_pass.sh diff --git a/functions/core_functions.sh b/functions/core_functions.sh index 1c1458595..560a2ee26 100644 --- a/functions/core_functions.sh +++ b/functions/core_functions.sh @@ -85,7 +85,7 @@ functionfile="${FUNCNAME}" fn_runfunction } -command_ts3_server_password.sh(){ +command_ts3_server_pass.sh(){ functionfile="${FUNCNAME}" fn_runfunction } diff --git a/functions/core_getopt.sh b/functions/core_getopt.sh index 38143b728..30bb0bf69 100644 --- a/functions/core_getopt.sh +++ b/functions/core_getopt.sh @@ -90,8 +90,8 @@ case "$getopt" in command_details.sh;; b|backup) command_backup.sh;; - pw|serveradmin-password) - command_ts3_server_password.sh;; + pw|serveradmin-password) + command_ts3_server_pass.sh;; dev|dev-debug) command_dev_debug.sh;; i|install) @@ -115,7 +115,7 @@ case "$getopt" in echo -e "\e[34mmonitor\t\e[0mChecks that the server is running." echo -e "\e[34memail-test\t\e[0mSends test monitor email." echo -e "\e[34mdetails\t\e[0mDisplays useful infomation about the server." - echo -e "\e[34mserveradmin-password\t\e[0mChanges TS3 server password." + echo -e "\e[34mserveradmin-password\t\e[0mChanges TS3 serveradmin password." echo -e "\e[34mbackup\t\e[0mCreate archive of the server." echo -e "\e[34minstall\t\e[0mInstall the server." echo -e "\e[34mauto-install\t\e[0mInstall the server, without prompts." From 63589ee53e27c28dccb0667543492e2f0073b7ee Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 7 Jan 2016 22:11:49 +0000 Subject: [PATCH 05/14] Streamlined the command * Streamlined the command to use command_start * made interface mor like command_console and command_backup --- functions/command_start.sh | 8 +++- functions/command_ts3_server_pass.sh | 58 ++++++++++++---------------- 2 files changed, 30 insertions(+), 36 deletions(-) diff --git a/functions/command_start.sh b/functions/command_start.sh index a79302698..d71b99e5a 100644 --- a/functions/command_start.sh +++ b/functions/command_start.sh @@ -2,7 +2,7 @@ # LGSM command_start.sh function # Author: Daniel Gibbs # Website: http://gameservermanagers.com -lgsm_version="271215" +lgsm_version="070116" # Description: Starts the server. @@ -55,7 +55,11 @@ mv "${scriptlog}" "${scriptlogdate}" # Create lock file date > "${rootdir}/${lockselfname}" cd "${executabledir}" -./ts3server_startscript.sh start inifile="${servercfgfullpath}" > /dev/null 2>&1 +if [ "${ts2serverpass}" == "1" ];then + ./ts3server_startscript.sh start serveradmin_password="${newpassword}" +else + ./ts3server_startscript.sh start inifile="${servercfgfullpath}" > /dev/null 2>&1 +fi sleep 1 info_ts3status.sh if [ "${ts3status}" = "Server seems to have died" ]||[ "${ts3status}" = "No server running (ts3server.pid is missing)" ]; then diff --git a/functions/command_ts3_server_pass.sh b/functions/command_ts3_server_pass.sh index bb3803015..e5f980832 100644 --- a/functions/command_ts3_server_pass.sh +++ b/functions/command_ts3_server_pass.sh @@ -3,7 +3,7 @@ # Author: Daniel Gibbs # Contributor : UltimateByte # Website: http://gameservermanagers.com -lgsm_version="050116" +lgsm_version="070116" # Description: Changes TS3 serveradmin password @@ -12,43 +12,39 @@ function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" fn_serveradmin_password_prompt(){ -fn_printwarn "Initiating TS3 serveradmin password change" -sleep 2 -echo -en "\n" -echo "Changing telnet ServerQuery password" +echo "" +echo "${gamename} ServerAdmin Password Change" +echo "============================" +echo "" +echo "Press \"CTRL+b d\" to exit console." +fn_printwarningnl "You are about to change the ${gamename} ServerAdmin password" +echo "" while true; do - read -p "Continue ? [y/n]" yn + read -e -i "y" -p "Continue? [y/N]" yn case $yn in [Yy]* ) break;; - [Nn]* ) exit;; + [Nn]* ) echo Exiting; return;; * ) echo "Please answer yes or no.";; - esac +esac done - -fn_scriptlog "Initiating serveradmin password change" -echo -n "Enter the new password : " ; read newpassword -fn_scriptlog "New serveradmin password chosen" +fn_scriptlog "Initiating ${gamename} ServerAdmin password change" +read -p "Enter new password : " newpassword } fn_serveradmin_password_set(){ -fn_printdots "Applying new password" +fn_printinfo "Applying new password" +fn_scriptlog "Applying new password" sleep 1 -fn_scriptlog "Starting routine with new password start option" - -./ts3server_startscript.sh start serveradmin_password="${newpassword}" > /dev/null 2>&1 - -info_ts3status.sh -if [ "${ts3status}" = "Server seems to have died" ]||[ "${ts3status}" = "No server running (ts3server.pid is missing)" ]; then - fn_printfailnl "Unable to start ${servername}" - fn_scriptlog "Unable to start ${servername}" - echo -e " Check log files: ${rootdir}/log" - exit 1 -else - fn_printok "${servername} has set a new serveradmin password" - echo -en "\n" - fn_scriptlog "Started ${servername} with new password" -fi +# Stop any running server +command_stop.sh +# Start server in "new password mode" +ts3serverpass="1" +command_start.sh +# Stop server in "new password mode" +command_stop.sh +fn_printok "Applying new password" +fn_scriptlog "New ServerAdmin password has been applyed" sleep 1 } @@ -58,14 +54,8 @@ fn_serveradmin_password_prompt info_ts3status.sh if [ "${ts3status}" == "Server is running" ]; then - command_stop.sh fn_serveradmin_password_set - echo "Server will now restart normally" - sleep 1 - command_stop.sh command_start.sh else fn_serveradmin_password_set - echo -en "\n" - command_stop.sh fi \ No newline at end of file From 56a7f1826da8a0fe5c5ffd78c072dff79d9e2648 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 7 Jan 2016 22:13:50 +0000 Subject: [PATCH 06/14] date --- functions/core_getopt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/core_getopt.sh b/functions/core_getopt.sh index 30bb0bf69..913801801 100644 --- a/functions/core_getopt.sh +++ b/functions/core_getopt.sh @@ -2,7 +2,7 @@ # LGSM core_getopt.sh function # Author: Daniel Gibbs # Website: http://gameservermanagers.com -lgsm_version="050116" +lgsm_version="070116" # Description: getopt arguments. From 1c60dc3b6a9895fe8914fcdc928255b5b3269d66 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 7 Jan 2016 22:17:06 +0000 Subject: [PATCH 07/14] updated warning message --- functions/command_ts3_server_pass.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/functions/command_ts3_server_pass.sh b/functions/command_ts3_server_pass.sh index e5f980832..556f9e6ff 100644 --- a/functions/command_ts3_server_pass.sh +++ b/functions/command_ts3_server_pass.sh @@ -17,7 +17,8 @@ echo "${gamename} ServerAdmin Password Change" echo "============================" echo "" echo "Press \"CTRL+b d\" to exit console." -fn_printwarningnl "You are about to change the ${gamename} ServerAdmin password" +fn_printinfonl "You are about to change the ${gamename} ServerAdmin password" +fn_printwarningnl "${gamename} will restart during this process" echo "" while true; do read -e -i "y" -p "Continue? [y/N]" yn From a4a6d16953896f776d8c11ff3e4e966f57ed78ce Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 7 Jan 2016 22:20:20 +0000 Subject: [PATCH 08/14] corrected messages --- functions/command_ts3_server_pass.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/functions/command_ts3_server_pass.sh b/functions/command_ts3_server_pass.sh index 556f9e6ff..231486215 100644 --- a/functions/command_ts3_server_pass.sh +++ b/functions/command_ts3_server_pass.sh @@ -17,7 +17,7 @@ echo "${gamename} ServerAdmin Password Change" echo "============================" echo "" echo "Press \"CTRL+b d\" to exit console." -fn_printinfonl "You are about to change the ${gamename} ServerAdmin password" +fn_printinfomationnl "You are about to change the ${gamename} ServerAdmin password" fn_printwarningnl "${gamename} will restart during this process" echo "" while true; do @@ -34,7 +34,7 @@ read -p "Enter new password : " newpassword fn_serveradmin_password_set(){ -fn_printinfo "Applying new password" +fn_printinfonl "Applying new password" fn_scriptlog "Applying new password" sleep 1 # Stop any running server From e056fc2b31a88c1d2cd20a078d2c1316060f69a7 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 7 Jan 2016 22:21:26 +0000 Subject: [PATCH 09/14] added nl --- functions/command_ts3_server_pass.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/command_ts3_server_pass.sh b/functions/command_ts3_server_pass.sh index 231486215..c92581ec7 100644 --- a/functions/command_ts3_server_pass.sh +++ b/functions/command_ts3_server_pass.sh @@ -44,7 +44,7 @@ ts3serverpass="1" command_start.sh # Stop server in "new password mode" command_stop.sh -fn_printok "Applying new password" +fn_printoknl "Applying new password" fn_scriptlog "New ServerAdmin password has been applyed" sleep 1 } From 656746f2cdd833687f951eccba9dcce2b4262a5f Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 7 Jan 2016 22:35:01 +0000 Subject: [PATCH 10/14] More interface changes --- functions/command_ts3_server_pass.sh | 11 ++++++----- functions/core_getopt.sh | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/functions/command_ts3_server_pass.sh b/functions/command_ts3_server_pass.sh index c92581ec7..f8563f3d2 100644 --- a/functions/command_ts3_server_pass.sh +++ b/functions/command_ts3_server_pass.sh @@ -7,7 +7,7 @@ lgsm_version="070116" # Description: Changes TS3 serveradmin password -local modulename="TS3 Server Password" +local modulename="Change password" function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" @@ -17,8 +17,8 @@ echo "${gamename} ServerAdmin Password Change" echo "============================" echo "" echo "Press \"CTRL+b d\" to exit console." -fn_printinfomationnl "You are about to change the ${gamename} ServerAdmin password" -fn_printwarningnl "${gamename} will restart during this process" +fn_printinfomationnl "You are about to change the ${gamename} ServerAdmin password." +fn_printwarningnl "${gamename} will restart during this process." echo "" while true; do read -e -i "y" -p "Continue? [y/N]" yn @@ -41,11 +41,12 @@ sleep 1 command_stop.sh # Start server in "new password mode" ts3serverpass="1" +fn_printinfonl "Starting with new password" command_start.sh # Stop server in "new password mode" command_stop.sh -fn_printoknl "Applying new password" -fn_scriptlog "New ServerAdmin password has been applyed" +fn_printoknl "Password applied" +fn_scriptlog "New ServerAdmin password applied" sleep 1 } diff --git a/functions/core_getopt.sh b/functions/core_getopt.sh index 913801801..9c848b5fd 100644 --- a/functions/core_getopt.sh +++ b/functions/core_getopt.sh @@ -90,7 +90,7 @@ case "$getopt" in command_details.sh;; b|backup) command_backup.sh;; - pw|serveradmin-password) + pw|change-password) command_ts3_server_pass.sh;; dev|dev-debug) command_dev_debug.sh;; From a50e2dc8c786df9a350b975b72dba3b251e6c5ce Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 7 Jan 2016 22:37:58 +0000 Subject: [PATCH 11/14] corrected message --- functions/core_getopt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/core_getopt.sh b/functions/core_getopt.sh index 9c848b5fd..95196d0ef 100644 --- a/functions/core_getopt.sh +++ b/functions/core_getopt.sh @@ -115,7 +115,7 @@ case "$getopt" in echo -e "\e[34mmonitor\t\e[0mChecks that the server is running." echo -e "\e[34memail-test\t\e[0mSends test monitor email." echo -e "\e[34mdetails\t\e[0mDisplays useful infomation about the server." - echo -e "\e[34mserveradmin-password\t\e[0mChanges TS3 serveradmin password." + echo -e "\e[34mchange-password\t\e[0mChanges TS3 serveradmin password." echo -e "\e[34mbackup\t\e[0mCreate archive of the server." echo -e "\e[34minstall\t\e[0mInstall the server." echo -e "\e[34mauto-install\t\e[0mInstall the server, without prompts." From 2ce3389e31a2ca31f527291b06bf0d4505a8009b Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 7 Jan 2016 22:39:53 +0000 Subject: [PATCH 12/14] word server --- functions/command_ts3_server_pass.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/command_ts3_server_pass.sh b/functions/command_ts3_server_pass.sh index f8563f3d2..424d3ed1f 100644 --- a/functions/command_ts3_server_pass.sh +++ b/functions/command_ts3_server_pass.sh @@ -41,7 +41,7 @@ sleep 1 command_stop.sh # Start server in "new password mode" ts3serverpass="1" -fn_printinfonl "Starting with new password" +fn_printinfonl "Starting server with new password" command_start.sh # Stop server in "new password mode" command_stop.sh From 9dd1b0c83e1f04e19245de1e5d7b167c1dde2791 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 7 Jan 2016 22:45:06 +0000 Subject: [PATCH 13/14] minor fix --- functions/command_start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/command_start.sh b/functions/command_start.sh index d71b99e5a..309a8078f 100644 --- a/functions/command_start.sh +++ b/functions/command_start.sh @@ -55,7 +55,7 @@ mv "${scriptlog}" "${scriptlogdate}" # Create lock file date > "${rootdir}/${lockselfname}" cd "${executabledir}" -if [ "${ts2serverpass}" == "1" ];then +if [ "${ts3serverpass}" == "1" ];then ./ts3server_startscript.sh start serveradmin_password="${newpassword}" else ./ts3server_startscript.sh start inifile="${servercfgfullpath}" > /dev/null 2>&1 From cfa3ffa409be7f756b68900fb098c54ebab5b04b Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 8 Jan 2016 20:20:37 +0000 Subject: [PATCH 14/14] date --- functions/command_ts3_server_pass.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/functions/command_ts3_server_pass.sh b/functions/command_ts3_server_pass.sh index 424d3ed1f..3cd0f0b1f 100644 --- a/functions/command_ts3_server_pass.sh +++ b/functions/command_ts3_server_pass.sh @@ -3,7 +3,7 @@ # Author: Daniel Gibbs # Contributor : UltimateByte # Website: http://gameservermanagers.com -lgsm_version="070116" +lgsm_version="080116" # Description: Changes TS3 serveradmin password @@ -54,7 +54,6 @@ sleep 1 check.sh fn_serveradmin_password_prompt info_ts3status.sh - if [ "${ts3status}" == "Server is running" ]; then fn_serveradmin_password_set command_start.sh