SOURCES: sensors.sh - simplified, match more cases, no utf-8 depen...

[pascalek]

Author: pascalek                     Date: Thu Nov 16 19:17:48 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- simplified, match more cases, no utf-8 dependencies

---- Files affected:
SOURCES:
   sensors.sh (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/sensors.sh
diff -u SOURCES/sensors.sh:1.1 SOURCES/sensors.sh:1.2
--- SOURCES/sensors.sh:1.1	Wed Nov 15 16:33:17 2006
+++ SOURCES/sensors.sh	Thu Nov 16 20:17:43 2006
@@ -23,11 +23,9 @@
 	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" |
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/sensors.sh?r1=1.1&r2=1.2&f=u