improved help a bit, and made -l or -u trigger -P too

This commit is contained in:
inxi-svn 2009-02-05 01:03:49 +00:00
parent 83878c2fa8
commit 29bd7429e9

6
inxi
View file

@ -840,6 +840,7 @@ get_parameters()
use_short='false' use_short='false'
;; ;;
l) B_SHOW_LABELS='true' l) B_SHOW_LABELS='true'
B_SHOW_PARTITIONS='true'
use_short='false' use_short='false'
;; ;;
N) B_SHOW_NETWORK='true' N) B_SHOW_NETWORK='true'
@ -856,6 +857,7 @@ get_parameters()
use_short='false' use_short='false'
;; ;;
u) B_SHOW_UUIDS='true' u) B_SHOW_UUIDS='true'
B_SHOW_PARTITIONS='true'
use_short='false' use_short='false'
;; ;;
v) if [[ -n $( egrep "^[0-9][0-9]?$" <<< $OPTARG ) && $OPTARG -le $VERBOSITY_LEVELS ]];then v) if [[ -n $( egrep "^[0-9][0-9]?$" <<< $OPTARG ) && $OPTARG -le $VERBOSITY_LEVELS ]];then
@ -957,14 +959,14 @@ show_options()
print_screen_output "-i Show Wan IP address, and shows local interfaces (requires ifconfig network tool)." print_screen_output "-i Show Wan IP address, and shows local interfaces (requires ifconfig network tool)."
print_screen_output " Not shown with -F for user security reasons, you shouldn't paste your local/wan IP." print_screen_output " Not shown with -F for user security reasons, you shouldn't paste your local/wan IP."
print_screen_output "-I Show information: processes, uptime, memory, irc client, inxi version." print_screen_output "-I Show information: processes, uptime, memory, irc client, inxi version."
print_screen_output "-l Show partition labels (use with -p or -P)." print_screen_output "-l Show partition labels. Default: short partition -P. For full -p output, use: -pl (or -plu)."
print_screen_output "-N Show network card information." print_screen_output "-N Show network card information."
print_screen_output "-p Show full partition information (-P plus all other detected partitions)." print_screen_output "-p Show full partition information (-P plus all other detected partitions)."
print_screen_output " If any of your partitions have spaces in their names, they will not show with -p" print_screen_output " If any of your partitions have spaces in their names, they will not show with -p"
print_screen_output "-P Show partition information (shows what -v4 would show, but without extra data)." print_screen_output "-P Show partition information (shows what -v4 would show, but without extra data)."
print_screen_output " Shows, if detected: / /boot /home /tmp /usr /var. Use -p for All partitions." print_screen_output " Shows, if detected: / /boot /home /tmp /usr /var. Use -p for All partitions."
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 (use with -p or -P)." 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."
print_screen_output " Supported levels: 0-${VERBOSITY_LEVELS} Example: $SCRIPT_NAME -v 4" print_screen_output " Supported levels: 0-${VERBOSITY_LEVELS} Example: $SCRIPT_NAME -v 4"
print_screen_output " 0 - short output, same as: $SCRIPT_NAME" print_screen_output " 0 - short output, same as: $SCRIPT_NAME"