From 65ed63de5868586f81f8483e167bb295e2afebea Mon Sep 17 00:00:00 2001 From: Meliox Date: Wed, 12 Jun 2024 19:34:15 +0200 Subject: [PATCH] add same logic for intel --- pve-mod-gui-sensors.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pve-mod-gui-sensors.sh b/pve-mod-gui-sensors.sh index a85f9c7..97f2c79 100644 --- a/pve-mod-gui-sensors.sh +++ b/pve-mod-gui-sensors.sh @@ -86,6 +86,7 @@ function install_packages { function configure { sensorsDetected=false local sensorsOutput=$(sensors -j) + if [ $? -ne 0 ]; then err "Sensor output error.\n\nCommand output:\n${sensorsOutput}\n\nExiting...\n" fi @@ -97,24 +98,26 @@ function configure { case "$item" in "coretemp-"*) # Intel CPU - # Set temperature search criterias - CPU_ADDRESS_PREFIX=$item - CPU_ITEM_PREFIX="Core " - CPU_TEMP_CAPTION="Core" + # Set temperature search criterias + if (echo "$sensorsOutput" | grep -A 10 "$item" | grep -q "Core "); then + CPU_ADDRESS_PREFIX=$item + CPU_ITEM_PREFIX="Core " + CPU_TEMP_CAPTION="Core" + fi break ;; "k10temp-"*) # AMD CPU # Find and set temperature search criterias - if (echo "$sensorsOutput" | grep -A 2 "$item" | grep -q "Tctl"); then + if (echo "$sensorsOutput" | grep -A 4 "$item" | grep -q "Tctl"); then CPU_ADDRESS_PREFIX=$item CPU_ITEM_PREFIX="Tccd" CPU_TEMP_CAPTION="Temp" - elif (echo "$sensorsOutput" | grep -A 2 "$item" | grep -q "Tccd"); then + elif (echo "$sensorsOutput" | grep -A 4 "$item" | grep -q "Tccd"); then CPU_ADDRESS_PREFIX=$item CPU_ITEM_PREFIX="Tccd" CPU_TEMP_CAPTION="Temp" - else + elif (echo "$sensorsOutput" | grep -A 4 "$item" | grep -q "temp"); then CPU_ADDRESS_PREFIX=$item CPU_ITEM_PREFIX="temp" CPU_TEMP_CAPTION="Temp"