(bug fix / tweak)

Added back in -s show sensors always to avoid confusion, but turns off if error message for -F output. This is to avoid spam yet still 
have it work always as expected.
This commit is contained in:
inxi-svn 2009-08-04 00:21:54 +00:00
parent 0d24ff1bcb
commit a2c6aabcd8

6
inxi
View file

@ -1208,7 +1208,6 @@ show_options()
print_screen_output "-P Show Partition information (shows what -v 4 would show, but without extra data)." print_screen_output "-P Show Partition information (shows what -v 4 would show, but without extra data)."
print_screen_output " Shows, if detected: / /boot /home /tmp /usr /var. Use -p to see all mounted partitions." print_screen_output " Shows, if detected: / /boot /home /tmp /usr /var. Use -p to see all mounted partitions."
print_screen_output "-s Show sensors output (if sensors installed/configured): mobo/cpu temp; detected fan speeds." print_screen_output "-s Show sensors output (if sensors installed/configured): mobo/cpu temp; detected fan speeds."
print_screen_output " Note: if no Sensors: output, start inxi like this to see error messages: inxi -s -! 1"
print_screen_output "-S Show System information: host name, kernel, distro" print_screen_output "-S Show System information: host name, kernel, distro"
print_screen_output "-u Show partition UUIDs. Default: short partition -P. For full -p output, use: -pu (or -plu)." print_screen_output "-u Show partition UUIDs. Default: short partition -P. For full -p output, use: -pu (or -plu)."
print_screen_output "-v Script verbosity levels. Verbosity level number is required." print_screen_output "-v Script verbosity levels. Verbosity level number is required."
@ -4353,8 +4352,9 @@ print_sensors_data()
esac esac
done done
fi fi
# turning off all output for case where no sensors detected or no sensors output # turning off all output for case where no sensors detected or no sensors output
if [[ $b_is_error != 'true' || $B_TESTING_1 == 'true' ]];then # unless -s used explicitly. So for -F type output won't show unless valid or -! 1 used
if [[ $b_is_error != 'true' || $B_SHOW_SENSORS == 'true' || $B_TESTING_1 == 'true' ]];then
temp_data="$cpu_temp$mobo_temp$psu_temp$gpu_temp" temp_data="$cpu_temp$mobo_temp$psu_temp$gpu_temp"
temp_data=$( create_print_line "Sensors:" "$temp_data" ) temp_data=$( create_print_line "Sensors:" "$temp_data" )
print_screen_output "$temp_data" print_screen_output "$temp_data"