From 4290ee3fd1e7e68f974b24a3d32d1aaa95f061a2 Mon Sep 17 00:00:00 2001 From: inxi-svn Date: Mon, 27 Jul 2009 22:08:34 +0000 Subject: [PATCH] tweaked output --- inxi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/inxi b/inxi index a0b2c1c..d2291bb 100755 --- a/inxi +++ b/inxi @@ -1,7 +1,7 @@ #!/bin/bash ######################################################################## #### Script Name: inxi -#### version: 1.0.93-b1 +#### version: 1.0.94-b1 #### Date: 27 July 2009 ######################################################################## #### SPECIAL THANKS @@ -4080,26 +4080,26 @@ print_sensors_data() # we need to make sure it's either cpu fan OR cpu fan and sys fan 1 if [[ -n ${A_SENSORS_DATA[2]} ]];then - cpu_fan="${A_SENSORS_DATA[2]}rpm" + cpu_fan="${A_SENSORS_DATA[2]}" elif [[ -z ${A_SENSORS_DATA[2]} && -n ${A_SENSORS_DATA[3]} ]];then - cpu_fan="${A_SENSORS_DATA[3]}rpm" + cpu_fan="${A_SENSORS_DATA[3]}" else cpu_fan='N/A' fi - cpu_fan="${C1}Cpu Fan:${C2} $cpu_fan " + cpu_fan="${C1}FANS(rpm) cpu:${C2} $cpu_fan " # then set the sys fans, if present or 0. sys fan 1 only if cpu fan is present, # otherwise fan1: is cpu fan if [[ -n ${A_SENSORS_DATA[2]} && -n ${A_SENSORS_DATA[3]} ]];then - sys_fan1="${C1}Sys Fan1:${C2} ${A_SENSORS_DATA[3]}rpm " + sys_fan1="${C1}sys1:${C2} ${A_SENSORS_DATA[3]} " fi if [[ -n ${A_SENSORS_DATA[4]} ]];then - sys_fan2="${C1}Sys Fan2:${C2} ${A_SENSORS_DATA[4]}rpm " + sys_fan2="${C1}sys2:${C2} ${A_SENSORS_DATA[4]} " fi if [[ -n ${A_SENSORS_DATA[5]} ]];then - sys_fan3="${C1}Sys Fan3:${C2} ${A_SENSORS_DATA[5]}rpm " + sys_fan3="${C1}sys3:${C2} ${A_SENSORS_DATA[5]} " fi if [[ -n ${A_SENSORS_DATA[6]} ]];then - ps_fan="${C1}PS Fan:${C2} ${A_SENSORS_DATA[6]}rpm " + ps_fan="${C1}ps:${C2} ${A_SENSORS_DATA[6]} " fi fi sensors_data="$mobo_temp$cpu_temp$cpu_fan$sys_fan1$sys_fan2$sys_fan3$ps_fan"