From eebe419e5ad515f5312888bce58be1f9ffb0ada8 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Mon, 2 Jan 2023 10:48:08 -0600
Subject: [PATCH] Update dsmon.sh

---
 dsmon.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/dsmon.sh b/dsmon.sh
index 5f8bea4..9864672 100755
--- a/dsmon.sh
+++ b/dsmon.sh
@@ -113,7 +113,7 @@ CHECK(){
 			DRIVEINFO=$(ssh root@${host_ip[$hostid]} df -BM | grep -vE '^Filesystem|tmpfs|cdrom|@|ram|loop|udev|veeamimage|nvme|localhost|shm|mmcblk|overlay|-volume|Music|media-data|Software' | awk '{ print $1 " " $2 " " $4 }')
 			DRIVEINFO=(${DRIVEINFO})
 			
-			for x in "${!DRIVEINFO[@]}"; do printf "[%s]=%s\n" "$x" "${DRIVEINFO[$x]}" ; done
+			# for x in "${!DRIVEINFO[@]}"; do printf "[%s]=%s\n" "$x" "${DRIVEINFO[$x]}" ; done
 			
 			NUMDRIVES=$((${#DRIVEINFO[@]} / 3))
 			declare -A DRIVEINFO_TOT DRIVEINFO_FREE DRIVEINFO_FREEPER
@@ -125,7 +125,7 @@ CHECK(){
 				dname=${dname//\/dev\/mapper\//}
 				dname=${dname//\/dev\//}
 				
-				if [ "${dname}" = "sda1" ] && [ ${DRIVEINFO[$((${ii}+1))]//M/} -lt 102 ]; then
+				if [ "${dname}" = "sda1" ] && [ ${DRIVEINFO[$((${ii}+1))]//M/} -lt 1024 ]; then
 					systempartition=true
 				elif [ "${dname}" = "sda2" ] && [ ${DRIVEINFO[$((${ii}+1))]//M/} -lt 1024 ]; then
 					systempartition=true
@@ -149,12 +149,12 @@ CHECK(){
 			
 			IFS=$'\n' DRIVES=($(sort <<<"${DRIVES[*]}")); unset IFS
 			
-			for x in "${!DRIVEINFO_TOT[@]}"; do printf "[%s]=%s\n" "$x" "${DRIVEINFO_TOT[$x]}" ; done
-			echo
-			for x in "${!DRIVEINFO_FREE[@]}"; do printf "[%s]=%s\n" "$x" "${DRIVEINFO_FREE[$x]}" ; done
-			echo
-			for x in "${!DRIVEINFO_FREEPER[@]}"; do printf "[%s]=%s\n" "$x" "${DRIVEINFO_FREEPER[$x]}" ; done
-			echo
+			# for x in "${!DRIVEINFO_TOT[@]}"; do printf "[%s]=%s\n" "$x" "${DRIVEINFO_TOT[$x]}" ; done
+			# echo
+			# for x in "${!DRIVEINFO_FREE[@]}"; do printf "[%s]=%s\n" "$x" "${DRIVEINFO_FREE[$x]}" ; done
+			# echo
+			# for x in "${!DRIVEINFO_FREEPER[@]}"; do printf "[%s]=%s\n" "$x" "${DRIVEINFO_FREEPER[$x]}" ; done
+			# echo
 			
 			for DRIVE in "${DRIVES[@]}"; do
 				if (( $(bc <<<"${DRIVEINFO_FREEPER[$DRIVE]} <= 15") )); then
@@ -180,7 +180,7 @@ CHECK(){
 				spc2=`expr ${cw} - ${#DRIVEINFO_FREE[$DRIVE]}`
 				until [ $c = ${spc2} ]; do spcB="${spcB} "; c=`expr $c + 1`; done
 
-				echo -e "${idsCL[$fs_status_color]} ${DRIVE}${spcA}: ${DRIVEINFO_FREE[$DRIVE]} GB Free${spcB}${DRIVEINFO_FREEPER[$DRIVE]}%${idsCL[Default]}"
+				echo -e "${idsCL[$fs_status_color]} ${DRIVE}${spcA}: ${DRIVEINFO_FREE[$DRIVE]} GB Free${spcB}${DRIVEINFO_FREEPER[$DRIVE]}% (${DRIVEINFO_TOT[$DRIVE]})${idsCL[Default]}"
 			done
 			
 			unset DRIVEINFO_TOT DRIVEINFO_FREE DRIVEINFO_FREEPER DRIVES DRIVEINFO