From 2e3c4fe18f43e595d2d59299099fe7242373f35d Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 20 Dec 2015 19:06:00 +0000 Subject: [PATCH] Added missing quotes --- functions/fn_details_distro | 14 +++++++------- functions/fn_monitor_query | 5 ++--- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/functions/fn_details_distro b/functions/fn_details_distro index ff9856036..4307e9093 100644 --- a/functions/fn_details_distro +++ b/functions/fn_details_distro @@ -2,7 +2,7 @@ # LGSM fn_details_distro function # Author: Daniel Gibbs # Website: http://gameservermanagers.com -lgsm_version="061115" +lgsm_version="201215" # Description: Variables providing useful info on the Operating System such as disk and performace info. # Used for fn_details, fn_debug and fn_email. @@ -64,13 +64,13 @@ days=$(( uptime/60/60/24 )) # Disk usage # available space on the partition. -filesystem=$(df -hP ${rootdir} | grep -v "Filesystem" | awk '{print $1}') -totalspace=$(df -hP ${rootdir} | grep -v "Filesystem" | awk '{print $2}') -usedspace=$(df -hP ${rootdir} | grep -v "Filesystem" | awk '{print $3}') -availspace=$(df -hP ${rootdir} | grep -v "Filesystem" | awk '{print $4}') +filesystem=$(df -hP "${rootdir}" | grep -v "Filesystem" | awk '{print $1}') +totalspace=$(df -hP "${rootdir}" | grep -v "Filesystem" | awk '{print $2}') +usedspace=$(df -hP "${rootdir}" | grep -v "Filesystem" | awk '{print $3}') +availspace=$(df -hP "${rootdir}" | grep -v "Filesystem" | awk '{print $4}') # used space in serverfiles dir. -serverfilesdu=$(du -sh ${serverfiles} | awk '{print $1}') +serverfilesdu=$(du -sh "${serverfiles}" | awk '{print $1}') if [ -z ${serverfilesdu} ]; then serverfilesdu="0M" fi @@ -78,7 +78,7 @@ fi # Backup info if [ -d "${backupdir}" ]; then # used space in backups dir. - backupdirdu=$(du -sh ${backupdir} | awk '{print $1}') + backupdirdu=$(du -sh "${backupdir}" | awk '{print $1}') if [ -z ${backupdirdu} ]; then backupdirdu="0M" fi diff --git a/functions/fn_monitor_query b/functions/fn_monitor_query index bba9bb13f..b75c6dba6 100644 --- a/functions/fn_monitor_query +++ b/functions/fn_monitor_query @@ -27,7 +27,7 @@ if [ -f "${rootdir}/gsquery.py" ]; then fn_printdots "Querying port: ${ip}:${port} : QUERYING" fn_scriptlog "Querying port: ${ip}:${port} : QUERYING" sleep 1 - serverquery=$(${rootdir}/gsquery.py -a ${ip} -p ${port} -e ${engine} 2>&1) + serverquery=$("${rootdir}/gsquery.py" -a ${ip} -p ${port} -e ${engine} 2>&1) exitcode=$? if [ "${exitcode}" == "1" ]||[ "${exitcode}" == "2" ]||[ "${exitcode}" == "3" ]||[ "${exitcode}" == "4" ]; then fn_printfail "Querying port: ${ip}:${port} : ${serverquery}" @@ -70,8 +70,7 @@ if [ -f "${rootdir}/gsquery.py" ]; then echo -en "\n" echo "Attempting to resolve automatically" chmod +x -v "${rootdir}/gsquery.py" - exitcode=$? - if [ "${exitcode}" == "0" ]; then + if [ $? -eq 0 ]; then fn_monitor_query else fn_printfailure "Unable to resolve automatically. Please manually fix permissions.\n"