From 5ab084df0f38dd63a3a9f560c78117c4892079bb Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 16 Jun 2024 18:34:08 +0100 Subject: [PATCH] rename variables to telnetpassword --- lgsm/modules/command_dev_parse_game_details.sh | 2 +- lgsm/modules/command_stop.sh | 4 ++-- lgsm/modules/info_game.sh | 2 +- lgsm/modules/info_messages.sh | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lgsm/modules/command_dev_parse_game_details.sh b/lgsm/modules/command_dev_parse_game_details.sh index 34feef5df..2e22aa7ae 100644 --- a/lgsm/modules/command_dev_parse_game_details.sh +++ b/lgsm/modules/command_dev_parse_game_details.sh @@ -112,7 +112,7 @@ declare -A server_details=( ['Steamworks Port']="${steamworksport}" ['Telnet Enabled']="${telnetenabled}" ['Telnet IP']="${telnetip}" - ['Telnet Password']="${telnetpass}" + ['Telnet Password']="${telnetpassword}" ['Telnet Port']="${telnetport}" ['Tickrate']="${tickrate}" ['Unknown Port']="${unknownport}" diff --git a/lgsm/modules/command_stop.sh b/lgsm/modules/command_stop.sh index 8a9c6cb84..0d41a76ce 100644 --- a/lgsm/modules/command_stop.sh +++ b/lgsm/modules/command_stop.sh @@ -96,7 +96,7 @@ fn_stop_graceful_goldsrc() { # telnet command for sdtd graceful shutdown. fn_stop_graceful_sdtd_telnet() { - if [ -z "${telnetpass}" ] || [ "${telnetpass}" == "NOT SET" ]; then + if [ -z "${telnetpassword}" ] || [ "${telnetpassword}" == "NOT SET" ]; then sdtd_telnet_shutdown=$(expect -c ' proc abort {} { puts "Timeout or EOF\n" @@ -118,7 +118,7 @@ fn_stop_graceful_sdtd_telnet() { } spawn telnet '"${telnetip}"' '"${telnetport}"' expect { - "password:" { send "'"${telnetpass}"'\r" } + "password:" { send "'"${telnetpassword}"'\r" } default abort } expect { diff --git a/lgsm/modules/info_game.sh b/lgsm/modules/info_game.sh index 391713e46..0f38ea250 100644 --- a/lgsm/modules/info_game.sh +++ b/lgsm/modules/info_game.sh @@ -1970,7 +1970,7 @@ fn_info_game_sdtd() { telnetenabled="${telnetenabled:-"NOT SET"}" # Telnet IP will be localhost if no password is set # check_ip will set the IP first. This will overwrite it. - if [ -z "${telnetpass}" ]; then + if [ -z "${telnetpassword}" ]; then telnetip="127.0.0.1" fi telnetpass="${telnetpass:-"NOT SET"}" diff --git a/lgsm/modules/info_messages.sh b/lgsm/modules/info_messages.sh index 543e5bee1..9bab0cbb7 100644 --- a/lgsm/modules/info_messages.sh +++ b/lgsm/modules/info_messages.sh @@ -30,8 +30,8 @@ fn_info_messages_password_strip() { httppassword="********" fi - if [ "${telnetpass}" ]; then - telnetpass="********" + if [ "${telnetpassword}" ]; then + telnetpassword="********" fi if [ "${wsapikey}" ]; then @@ -1442,7 +1442,7 @@ fn_info_messages_sdtd() { { echo -e "${lightblue}Telnet enabled:\t${default}${telnetenabled}" echo -e "${lightblue}Telnet address:\t${default}${telnetip} ${telnetport}" - echo -e "${lightblue}Telnet password:\t${default}${telnetpass}" + echo -e "${lightblue}Telnet password:\t${default}${telnetpassword}" } | column -s $'\t' -t }