From a30e1cb6efe01d6f55eb3660cbfca50115b29091 Mon Sep 17 00:00:00 2001 From: lejubila Date: Sat, 28 Aug 2021 12:17:22 +0200 Subject: [PATCH] fix return value when get value of sensor --- include/sensor.include.sh | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/include/sensor.include.sh b/include/sensor.include.sh index 818f73f..e0ed6e3 100644 --- a/include/sensor.include.sh +++ b/include/sensor.include.sh @@ -20,7 +20,8 @@ function sensor_get_state { sensor_set_state $1 $2 "" fi - return `cat "$STATUS_DIR/sensor$1_$2"` + local state=$(cat "$STATUS_DIR/sensor$1_$2" 2> /dev/null) + echo $state } # @@ -71,8 +72,8 @@ function sensor_status_all { av=${!a} for t in $SENSOR_STATE_TYPE do - sensor_get_state $i $t - echo -e "$av: $t $?" + local state=$(sensor_get_state $i $t) + echo -e "$av: $t $state" done done } @@ -88,14 +89,12 @@ function sensor_status { if [ -z "$2" ]; then for t in $SENSOR_STATE_TYPE do - sensor_get_state $i $t - echo -e "$av: $t $?" + local state=$(sensor_get_state $i $t) + echo -e "$av: $t $state" done else - sensor_get_state $i $2 - local state=$? + local state=$(sensor_get_state $i $2) echo -e "$state" - return $state fi } @@ -143,8 +142,8 @@ function json_sensor_status_all { js_type="" for t in $SENSOR_STATE_TYPE do - sensor_get_state $i $t - js_type="$js_type \"$t\": \"$?\", " + local state=$(sensor_get_state $i $t) + js_type="$js_type \"$t\": \"$state\", " done js_type="${js_type::-2}" js_item="$js_item \"$av\":{$js_type}, ";