Merge branch 'mainerror-master' into develop

Conflicts: liquidprompt
2013-07-07 15:25:56 +02:00 · 2013-07-07 15:25:56 +02:00 · 635285fbc4
commit 635285fbc4
parent 3a6798334d 0a161a6d3f
1 changed files with 5 additions and 1 deletions
--- a/6
+++ b/6
@ -1297,7 +1297,11 @@ _lp_temp_sensors() {
            temperature=$i
        fi
    done
-    echo -ne "$temperature"
+    if [[ $count -ne 0 ]] ; then
+        echo -ne "$(($temperature/$count))"
+    else
+        exit
+    fi
 }

 # Will set _LP_TEMP_FUNCTION so the temperature monitoring feature use an