Daniel Gibbs пре 10 година
родитељ
комит
2e3c4fe18f
2 измењених фајлова са 9 додато и 10 уклоњено
  1. 7 7
      functions/fn_details_distro
  2. 2 3
      functions/fn_monitor_query

+ 7 - 7
functions/fn_details_distro

@@ -2,7 +2,7 @@
 # LGSM fn_details_distro function
 # LGSM fn_details_distro function
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
 # 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.
 # Description: Variables providing useful info on the Operating System such as disk and performace info.
 # Used for fn_details, fn_debug and fn_email.
 # Used for fn_details, fn_debug and fn_email.
@@ -64,13 +64,13 @@ days=$(( uptime/60/60/24 ))
 
 
 # Disk usage
 # Disk usage
 # available space on the partition.
 # 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.
 # used space in serverfiles dir.
-serverfilesdu=$(du -sh ${serverfiles} | awk '{print $1}')
+serverfilesdu=$(du -sh "${serverfiles}" | awk '{print $1}')
 if [ -z ${serverfilesdu} ]; then
 if [ -z ${serverfilesdu} ]; then
 	serverfilesdu="0M"
 	serverfilesdu="0M"
 fi
 fi
@@ -78,7 +78,7 @@ fi
 # Backup info
 # Backup info
 if [ -d "${backupdir}" ]; then
 if [ -d "${backupdir}" ]; then
 	# used space in backups dir.
 	# used space in backups dir.
-	backupdirdu=$(du -sh ${backupdir} | awk '{print $1}')
+	backupdirdu=$(du -sh "${backupdir}" | awk '{print $1}')
 	if [ -z ${backupdirdu} ]; then
 	if [ -z ${backupdirdu} ]; then
 		backupdirdu="0M"
 		backupdirdu="0M"
 	fi
 	fi

+ 2 - 3
functions/fn_monitor_query

@@ -27,7 +27,7 @@ if [ -f "${rootdir}/gsquery.py" ]; then
 	fn_printdots "Querying port: ${ip}:${port} : QUERYING"
 	fn_printdots "Querying port: ${ip}:${port} : QUERYING"
 	fn_scriptlog "Querying port: ${ip}:${port} : QUERYING"
 	fn_scriptlog "Querying port: ${ip}:${port} : QUERYING"
 	sleep 1
 	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=$?
 	exitcode=$?
 	if [ "${exitcode}" == "1" ]||[ "${exitcode}" == "2" ]||[ "${exitcode}" == "3" ]||[ "${exitcode}" == "4" ]; then
 	if [ "${exitcode}" == "1" ]||[ "${exitcode}" == "2" ]||[ "${exitcode}" == "3" ]||[ "${exitcode}" == "4" ]; then
 		fn_printfail "Querying port: ${ip}:${port} : ${serverquery}"
 		fn_printfail "Querying port: ${ip}:${port} : ${serverquery}"
@@ -70,8 +70,7 @@ if [ -f "${rootdir}/gsquery.py" ]; then
 		echo -en "\n"
 		echo -en "\n"
 		echo "Attempting to resolve automatically"
 		echo "Attempting to resolve automatically"
 		chmod +x -v "${rootdir}/gsquery.py"
 		chmod +x -v "${rootdir}/gsquery.py"
-		exitcode=$?
-		if [ "${exitcode}" == "0" ]; then
+		if [ $? -eq 0 ]; then
 			fn_monitor_query
 			fn_monitor_query
 		else
 		else
 			fn_printfailure "Unable to resolve automatically. Please manually fix permissions.\n"
 			fn_printfailure "Unable to resolve automatically. Please manually fix permissions.\n"