From 248664c816eeb31ce6087ad4cd218f4d5a8796d4 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 5 Apr 2022 10:05:01 +0200 Subject: [PATCH] system: protect -n test with quotes, shell style while at it --- src/opnsense/scripts/system/temperature.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/opnsense/scripts/system/temperature.sh b/src/opnsense/scripts/system/temperature.sh index dd01c9685..e804946b3 100755 --- a/src/opnsense/scripts/system/temperature.sh +++ b/src/opnsense/scripts/system/temperature.sh @@ -26,12 +26,17 @@ CMD=${1} +SYSCTLS=" +dev.cpu.0.temperature +hw.acpi.thermal.tz0.temperature +hw.temperature.CPU +" + if [ "${CMD}" = 'rrd' ]; then - for i in dev.cpu.0.temperature hw.acpi.thermal.tz0.temperature hw.temperature.CPU - do - temp=`sysctl -i -n $i | sed 's/C//g'` - if [ ! -z $temp ]; then - echo $temp + for SYSCTL in ${SYSCTLS}; do + TEMP=$(sysctl -i -n ${SYSCTL} | sed 's/C//g') + if [ -n "${TEMP}" ]; then + echo ${TEMP} break fi done