From b1493a5e9a600e49cf29217a391a6a2a5269c45b Mon Sep 17 00:00:00 2001 From: Marvin Lehmann Date: Thu, 31 Aug 2017 17:09:00 +0200 Subject: [PATCH 1/2] Fixed GSLT installation --- lgsm/functions/install_gslt.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lgsm/functions/install_gslt.sh b/lgsm/functions/install_gslt.sh index 954a78af1..bef4c154b 100644 --- a/lgsm/functions/install_gslt.sh +++ b/lgsm/functions/install_gslt.sh @@ -30,15 +30,19 @@ if [ -z "${autoinstall}" ]; then echo "Enter token below (Can be blank)." echo -n "GSLT TOKEN: " read token - sed -i -e "s/gslt=\"\"/gslt=\"${token}\"/g" "${rootdir}/${selfname}" + if ! grep -q "^gslt=" "${configdirserver}/${servicename}.cfg" > /dev/null 2>&1; then + echo -e "\ngslt=\"${token}\"" >> "${configdirserver}/${servicename}.cfg" + else + sed -i -e "s/gslt=\".*\"/gslt=\"${token}\"/g" "${configdirserver}/${servicename}.cfg" + fi fi fi sleep 1 if [ "${gamename}" == "Tower Unite" ]; then - echo "The GSLT can be changed by editing ${servercfg}." - fn_script_log_info "The GSLT can be changed by editing ${servercfg}." + echo "The GSLT can be changed by editing ${servercfgdir}/${servercfg}." + fn_script_log_info "The GSLT can be changed by editing ${servercfgdir}/${servercfg}." else - echo "The GSLT can be changed by editing ${selfname}." - fn_script_log_info "The GSLT can be changed by editing ${selfname}." + echo "The GSLT can be changed by editing ${configdirserver}/${servicename}.cfg." + fn_script_log_info "The GSLT can be changed by editing ${configdirserver}/${servicename}.cfg." fi echo "" \ No newline at end of file From 839b6b4e3e601ad7cf44006e36c99f22952164f9 Mon Sep 17 00:00:00 2001 From: Marvin Lehmann Date: Thu, 31 Aug 2017 17:33:08 +0200 Subject: [PATCH 2/2] Improved sed safety --- lgsm/functions/install_gslt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/install_gslt.sh b/lgsm/functions/install_gslt.sh index bef4c154b..44ba390a3 100644 --- a/lgsm/functions/install_gslt.sh +++ b/lgsm/functions/install_gslt.sh @@ -33,7 +33,7 @@ if [ -z "${autoinstall}" ]; then if ! grep -q "^gslt=" "${configdirserver}/${servicename}.cfg" > /dev/null 2>&1; then echo -e "\ngslt=\"${token}\"" >> "${configdirserver}/${servicename}.cfg" else - sed -i -e "s/gslt=\".*\"/gslt=\"${token}\"/g" "${configdirserver}/${servicename}.cfg" + sed -i -e "s/gslt=\"[^\"]*\"/gslt=\"${token}\"/g" "${configdirserver}/${servicename}.cfg" fi fi fi