From 42684b4dc2017c36406c10d2c3b6373d2e86ae09 Mon Sep 17 00:00:00 2001 From: inxi-svn Date: Sat, 8 Nov 2008 18:33:40 +0000 Subject: [PATCH] Tweaked help text to better explain verbosity levels and extra options like -d, -f, -x. Fixed a small bug in the disk size calculator, now it works all with single decimal accuracy for percent used and disk spacke in GB. This should solve a problem on smaller disks where the total partition size fails to equal the total disk size, and where on single small disks, where the listed total size didn't match the calculated single disk output. --- inxi | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/inxi b/inxi index 0cb7b50..4f4574c 100755 --- a/inxi +++ b/inxi @@ -1,8 +1,8 @@ #!/bin/bash ######################################################################## #### Script Name: inxi -#### version: 0.4.6 -#### Date: November 7 2008 +#### version: 0.4.7 +#### Date: November 8 2008 ######################################################################## #### inxi is a fork of infobash, the original bash sys info script by locsmif #### As time permits functionality improvements and recoding will occur. @@ -516,6 +516,8 @@ show_options() print_screen_output "$SCRIPT_NAME supports the following options. You can combine" print_screen_output "them, or list them one by one: Examples: $SCRIPT_NAME -v4 -c6 OR $SCRIPT_NAME -dc 6" + print_screen_output "Note: all extra output options (like -d, -f, -x) require a verbosity level of 1 or higher." + print_screen_output "In other words, they do not run if you do not use either -d or -v1 (or higher)" print_screen_output "- - - - - - - - - - - - - - - - - - - - - - - - - - - - -" print_screen_output "-C Overrides defective or corrupted data." print_screen_output "-c Available color schemes. Scheme number is required." @@ -534,7 +536,7 @@ show_options() print_screen_output " 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot" print_screen_output " 5 - For multicore systems, also show per core clock speeds." print_screen_output "-V $SCRIPT_NAME version information. Prints information then exits." - print_screen_output "-x Show extra data: bogomips on cpu; full hard disk info with -v3 or greater." + print_screen_output "-x Show extra data: bogomips on cpu; full hard disk info (using -v3 or greater)." rint_screen_output "" } @@ -1177,8 +1179,9 @@ get_hdd_data_basic() size = size*1024/1000**3 # calculate size in GB size workingUsed = hddused*1024/1000**3 # calculate workingUsed in GB used if ( size > 0 && workingUsed > 0 ){ - diskUsed = int( workingUsed*100/size ) # calculate used percentage - size = int( size ) + diskUsed = workingUsed*100/size # calculate used percentage + diskUsed = sprintf( "%.1f", diskUsed ) + size = sprintf( "%.1f", size ) print size"GB,"diskUsed"% used" } else {