got rid of + signs

This commit is contained in:
inxi-svn 2009-07-27 04:48:29 +00:00
parent 5193280b8d
commit 161a7b975a

10
inxi
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### version: 1.0.80-b1 #### version: 1.0.81-b1
#### Date: 26 July 2009 #### Date: 26 July 2009
######################################################################## ########################################################################
#### SPECIAL THANKS #### SPECIAL THANKS
@ -3024,10 +3024,10 @@ get_sensors_data()
} }
# dumping the extra + signs, nobody has negative temps # dumping the extra + signs, nobody has negative temps
/M\/B Temp/ { /M\/B Temp/ {
moboTemp=$3 moboTemp=gensub( /\+(.+)/, "\\1", 1, $3 )
} }
/CPU Temp/ { /CPU Temp/ {
cpuTemp=$3 cpuTemp=gensub( /\+(.+)/, "\\1", 1, $3 )
} }
/CPU Fan/ { /CPU Fan/ {
cpuFan=$3 cpuFan=$3
@ -3923,11 +3923,11 @@ print_sensors_data()
cpu_temp="${C1}Cpu Temp:${C2} $cpu_temp" cpu_temp="${C1}Cpu Temp:${C2} $cpu_temp"
if [[ -n ${A_SENSORS_DATA[2]} ]];then if [[ -n ${A_SENSORS_DATA[2]} ]];then
cpu_fan=${A_SENSORS_DATA[2]} cpu_fan="${A_SENSORS_DATA[2]} rpm"
else else
cpu_fan='N/A' cpu_fan='N/A'
fi fi
cpu_fan="${C1}Cpu Fan:${C2} $cpu_fan rpm" cpu_fan="${C1}Cpu Fan:${C2} $cpu_fan"
sensors_data=${A_SENSORS_DATA[0]} sensors_data=${A_SENSORS_DATA[0]}
fi fi
sensors_data="$mobo_temp $cpu_temp $cpu_fan" sensors_data="$mobo_temp $cpu_temp $cpu_fan"