temperatures: update

1 files changed, 5 insertions, 7 deletions

diff --git a/temperatures b/temperatures
index 6307ca0..a542773 100755
--- a/temperatures
+++ b/temperatures
@@ -2,19 +2,17 @@
 
 host=$(hostname)
 
-if [[ $host == "bogues" ]]; then
-  echo "$(cat /proc/acpi/ibm/thermal | sed "s|\s\+| |g" | cut -d " " -f 2)°C"
-elif [[ $host == "durant" ]]; then
-  #echo "CPU:\t$(sensors | sed "s|\s\+| |g" | grep Package | cut -d " " -f 4)"
-  echo "CPU:           $(ipmitool sensor | sed "s|\s\+| |g" | grep CPU | cut -d " " -f 4 | cut -d. -f 1)°C"
+if [[ $host == "durant" ]]; then
+  #echo "CPU:           $(sensors | sed "s|\s\+| |g" | grep Package | cut -d " " -f 4)"
+  echo "CPU:            $(ipmitool sensor | sed "s|\s\+| |g" | grep CPU | cut -d " " -f 4 | cut -d. -f 1)°C"
   for disk in `fdisk -l 2>/dev/null | grep -P "/dev" | grep Disk | cut -d " " -f 2 | sed "s|:||"`; do
     case $disk in
       /dev/nvme*)
-        TEMP=$(nvme smart-log $disk | grep temperature | cut -d " " -f 27 | sed "s|C||")
+        TEMP=$(nvme smart-log $disk | grep temperature | sed "s|\s\+| |g" | cut -d " " -f 3 | sed "s|C||")
         echo "$disk\t$TEMP°C"
         ;;
       /dev/sd*)
-        TEMP=$(smartctl -a $disk | grep Temp | cut -d " " -f 37)
+        TEMP=$(smartctl -a $disk | grep Temp | cut -d " " -f 37 | tr '\n' ' ' | sed "s|\s*||g")
         if [[ $TEMP != "" ]]; then
           echo "$disk\t$TEMP°C"
         fi