OpenSource/PVE-mods
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename sensorsDetected to SENSORS_DETECTED

Browse Source
This commit is contained in:
rmm 2024-06-23 11:46:47 +02:00
parent 2a3b7d5750
commit 3db6f5ce0c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pve-mod-gui-sensors.sh
View File

@ -98,7 +98,7 @@ function install_packages {
} }
function configure { function configure {
sensorsDetected=false # this is a global variable (see install_mod()) SENSORS_DETECTED=false
local sensorsOutput local sensorsOutput
if [ $DEBUG_REMOTE = true ]; then if [ $DEBUG_REMOTE = true ]; then
@ -181,7 +181,7 @@ function configure {
if [[ -z "$CPU_ADDRESS_PREFIX" || -z "$CPU_ITEM_PREFIX" ]]; then if [[ -z "$CPU_ADDRESS_PREFIX" || -z "$CPU_ITEM_PREFIX" ]]; then
warn "The CPU configuration is not complete. Temperatures will not be available." warn "The CPU configuration is not complete. Temperatures will not be available."
else else
sensorsDetected=true SENSORS_DETECTED=true
fi fi
# Check if HDD/SSD data is installed # Check if HDD/SSD data is installed
@ -191,7 +191,7 @@ function configure {
if (echo "$sensorsOutput" | grep -q "drivetemp-scsi-"); then if (echo "$sensorsOutput" | grep -q "drivetemp-scsi-"); then
msg "Detected sensors:\n$(echo "$sensorsOutput" | grep -o '"drivetemp-scsi[^"]*"' | sed 's/"//g')" msg "Detected sensors:\n$(echo "$sensorsOutput" | grep -o '"drivetemp-scsi[^"]*"' | sed 's/"//g')"
enableHddTemp=true enableHddTemp=true
sensorsDetected=true SENSORS_DETECTED=true
else else
warn "Kernel module \"drivetemp\" is not installed. HDD/SDD temperatures will not be available." warn "Kernel module \"drivetemp\" is not installed. HDD/SDD temperatures will not be available."
enableHddTemp=false enableHddTemp=false
@ -206,7 +206,7 @@ function configure {
if (echo "$sensorsOutput" | grep -q "nvme-"); then if (echo "$sensorsOutput" | grep -q "nvme-"); then
msg "Detected sensors:\n$(echo "$sensorsOutput" | grep -o '"nvme[^"]*"' | sed 's/"//g')" msg "Detected sensors:\n$(echo "$sensorsOutput" | grep -o '"nvme[^"]*"' | sed 's/"//g')"
enableNvmeTemp=true enableNvmeTemp=true
sensorsDetected=true SENSORS_DETECTED=true
else else
warn "No NVMe temperature sensors found." warn "No NVMe temperature sensors found."
enableNvmeTemp=false enableNvmeTemp=false
@ -217,7 +217,7 @@ function configure {
if (echo "$sensorsOutput" | grep -q "fan[0-9]*_input"); then if (echo "$sensorsOutput" | grep -q "fan[0-9]*_input"); then
msg "Detected fan speed sensors:\n$(echo $sensorsOutput | grep -Po '"[^"]*":\s*\{\s*"fan[0-9]*_input[^}]*' | sed -E 's/"([^"]*)":.*/\1/')" msg "Detected fan speed sensors:\n$(echo $sensorsOutput | grep -Po '"[^"]*":\s*\{\s*"fan[0-9]*_input[^}]*' | sed -E 's/"([^"]*)":.*/\1/')"
enableFanSpeed=true enableFanSpeed=true
sensorsDetected=true SENSORS_DETECTED=true
# Prompt user for display zero speed fans # Prompt user for display zero speed fans
local choiceDisplayZeroSpeedFans=$(ask "Do you wish to display fans reporting a speed of zero? If no, only active fans will be displayed. (Y/n)") local choiceDisplayZeroSpeedFans=$(ask "Do you wish to display fans reporting a speed of zero? If no, only active fans will be displayed. (Y/n)")
case "$choiceDisplayZeroSpeedFans" in case "$choiceDisplayZeroSpeedFans" in
@ -238,7 +238,7 @@ function configure {
enableFanSpeed=false enableFanSpeed=false
fi fi
if [ $sensorsDetected = true ]; then if [ $SENSORS_DETECTED = true ]; then
local choiceTempUnit=$(ask "Do you wish to display temperatures in degrees Celsius [C] or Fahrenheit [f]? (C/f)") local choiceTempUnit=$(ask "Do you wish to display temperatures in degrees Celsius [C] or Fahrenheit [f]? (C/f)")
case "$choiceTempUnit" in case "$choiceTempUnit" in
[cC] | "") [cC] | "")
@ -300,7 +300,7 @@ function install_mod {
exit exit
fi fi
if [[ "$sensorsDetected" == true ]]; then if [ $SENSORS_DETECTED = true ]; then
local sensorsCmd local sensorsCmd
if [ $DEBUG_REMOTE = true ]; then if [ $DEBUG_REMOTE = true ]; then
sensorsCmd="cat \"$JSON_FILE\"" sensorsCmd="cat \"$JSON_FILE\""