From b0231b23cb21ddb0f18fd49aa1ff5b2d65d48584 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Tue, 9 Jan 2024 15:06:09 -0600
Subject: [PATCH] update

---
 defaults.inc     |  2 +-
 inc/power.inc.sh | 12 +-----------
 inc/temp.inc.sh  |  1 +
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index a6e3bd54..3a9334d0 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,5 +1,5 @@
 
-VERS='2.5.118-01092024'
+VERS='2.5.119-01092024'
 
 noheader=' update service dailytemp confsync -r -report '
 
diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index e2642dc1..305103d9 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -316,23 +316,13 @@ CHECKPOWER(){
 							average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} ${avgdays}); average_disp="${idsCL[LightYellow]}		`IDS_NUMBER_FORMAT ${average}`'watts"
 							echo -en "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}"
 						else
-							# if [ "${PW_HOST_IDRACS[${SENSOR}]}" == "10.2.1.21" ]; then
-								# vHOSTFAN=$(snmpwalk -v 1 -c public -t 2 ${PW_HOST_IDRACS[${SENSOR}]} .1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3 -O vq)
-								# FanSpeed=$(ROUND_NUMBER `echo "scale=0; $(ROUND_NUMBER `echo "scale=4; ${vHOSTFAN}/21200" | bc` 2)*100/1" | bc` 0)
-								echo -en "${idsCL[LightCyan]}	Getting FanSpeed..."
-								[ ! -f ${PW_TMPFOLDER}/.fanspeed.${SENSOR} ] && until [ -f ${PW_TMPFOLDER}/.fanspeed.${SENSOR} ]; do tmp=tmp; done
-								echo -en "\r\033[K${MSG}${idsCL[Cyan]}	[PS1=${idsCL[LightCyan]}${PS1}'A${idsCL[Cyan]}, PS2=${idsCL[LightCyan]}${PS2}'A${idsCL[Cyan]}]${idsCL[LightCyan]}	[FanSpeed=$(cat ${PW_TMPFOLDER}/.fanspeed.${SENSOR})'%]"
-								
-							# else
-							# 	echo -en "${idsCL[Cyan]}	[PS1=${idsCL[LightCyan]}${PS1}'A${idsCL[Cyan]}, PS2=${idsCL[LightCyan]}${PS2}'A${idsCL[Cyan]}]"
-							# fi
+							echo -en "${idsCL[Cyan]}	[PS1=${idsCL[LightCyan]}${PS1}'A${idsCL[Cyan]}, PS2=${idsCL[LightCyan]}${PS2}'A${idsCL[Cyan]}]"
 						fi
 					fi
 					echo -e "${idsCL[Default]}"					
 				fi
 			fi
 		done
-		rm -f ${PW_TMPFOLDER}/.fanspeed.*
 		DIVIDER . lightCyan 75
 		[ "${STYPE}" == "" ] || [ "${STYPE}" == "mainsite" ] && echo -e "${idsCL[LightCyan]}Mainsite Total           ${idsCL[Default]}: ${idsCL[LightGreen]}${SENSOR_TOTAL_AMPS_MAINSITE}'amps - `IDS_NUMBER_FORMAT ${SENSOR_TOTAL_WATTS_MAINSITE}`'watts"
 		[ "${STYPE}" == "" ] || [ "${STYPE}" == "offsite" ] && echo -e "${idsCL[LightCyan]}Offsite Total            ${idsCL[Default]}: ${idsCL[LightGreen]}${SENSOR_TOTAL_AMPS_OFFSITE}'amps - `IDS_NUMBER_FORMAT ${SENSOR_TOTAL_WATTS_OFFSITE}`'watts"
diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh
index 19a8f819..f9e41e97 100644
--- a/inc/temp.inc.sh
+++ b/inc/temp.inc.sh
@@ -135,6 +135,7 @@ CHECKTEMP(){
 			fi
 		fi
 	done
+	rm -f ${PW_TMPFOLDER}/.fanspeed.*
 	end=`date +%s`; runtime=$((end-start)); echo -e "runtime: ${runtime}"
 	[ "${PW_ACTION}" != "" ] && echo -e "${idsCL[Default]}"
 }