- simplified, match more cases, no utf-8 dependencies

Changed files:
    sensors.sh -> 1.2

diff --git a/sensors.sh b/sensors.sh
index 9327963bcd6d3863c55dbb0d45e01067e601499e..f586cb637deddafb18fda2f2b5b11afcc55b52bf 100644 (file)
--- a/sensors.sh
+++ b/sensors.sh
@@ -23,11 +23,9 @@ do
        echo "Press Ctrl+C to exit" | awk "{ printf(\"$FORMAT\", \$0) }"
        echo -ne `/usr/bin/sensors | 
                awk "{ printf(\"$FORMAT\", \\$0) }" | 
-               sed -r "s/( +[ +.0-9-]+) V(.*)/$BOLD$CYAN\1$NORMAL$CYAN V$NORMAL\2/g" |
-               sed -r "s/( +[ +.0-9-]+) RPM(.*)/$BOLD$CYAN\1$NORMAL$CYAN RPM$NORMAL\2/g" |
-               sed -r "s/( +[ +.0-9-]+)°C(.*)/$BOLD$CYAN\1$NORMAL$CYAN°C$NORMAL\2/g" |
 
-               sed -r "s/= ([ +.0-9-]+)([VRPM°C]*)([,\)])/= $BOLD$GREEN\1$NORMAL$GREEN\2$NORMAL\3/g" |
+               sed -r "s/( |:)([ +.0-9-]+)(.{1,3}[VMC])(.*)/\1$BOLD$CYAN\2$NORMAL$CYAN\3$NORMAL\4/g" |
+               sed -r "s/= ([ +.0-9-]+)(.{0,4})([,\)])/= $BOLD$GREEN\1$NORMAL$GREEN\2$NORMAL\3/g" |
                sed -r "s/sensor = (.*$)/sensor = $GREEN\1$NORMAL/g" |
 
                sed -r "s/^(.*):/$BOLD$BROWN\1$NORMAL:/g" |