From a8300115502d35119030cb4690c783a03399477c Mon Sep 17 00:00:00 2001 From: inxi-svn Date: Wed, 8 Jun 2011 17:32:58 +0000 Subject: [PATCH] Changed -m to -M, to keep it consistent. -m will be for future advanced machine information, just like -P is basic partitions and -p is complete. --- inxi | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/inxi b/inxi index 0840a6b..1526662 100755 --- a/inxi +++ b/inxi @@ -1,7 +1,7 @@ #!/bin/bash ######################################################################## #### Script Name: inxi -#### version: 1.6.2 +#### version: 1.6.3 #### Date: June 8 2011 ######################################################################## #### SPECIAL THANKS @@ -1510,7 +1510,7 @@ get_parameters() # the short form only runs if no args output args are used # no need to run through these if there are no args elif [[ -n $1 ]];then - while getopts Ac:CdDfFGhHiIlmnNopPrsSt:uv:VxzZ%@:${update_flags} opt + while getopts Ac:CdDfFGhHiIlMnNopPrsSt:uv:VxzZ%@:${update_flags} opt do case $opt in A) B_SHOW_AUDIO='true' @@ -1592,7 +1592,7 @@ get_parameters() B_SHOW_PARTITIONS='true' use_short='false' ;; - m) B_SHOW_MACHINE_DATA='true' + M) B_SHOW_MACHINE_DATA='true' use_short='false' ;; n) B_SHOW_ADVANCED_NETWORK='true' @@ -1781,8 +1781,8 @@ show_options() print_screen_output "one by one: Examples: $SCRIPT_NAME -v4 -c6 OR $SCRIPT_NAME -dDc 6" print_screen_output " " print_screen_output "If you start $SCRIPT_NAME with no arguments, it will show the short form." - print_screen_output "The following options if used without -d or -v will show just that complete line:" - print_screen_output "A,C,D,G,I,N,P,S,f,i,n,o,p,l,u,r,s,t - you can use these alone or together to show" + print_screen_output "The following options if used without -d or -v will show just the complete line(s):" + print_screen_output "A,C,D,G,I,M,N,P,S,f,i,n,o,p,l,u,r,s,t - you can use these alone or together to show" print_screen_output "just the line(s) you want to see." print_screen_output "If you use them with a -v level (or -d), it will show the full output for that line " print_screen_output "along with the output for the chosen verbosity level." @@ -1809,7 +1809,7 @@ show_options() 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 "-l Show partition labels. Default: short partition -P. For full -p output, use: -pl (or -plu)." - print_screen_output "-m Show machine data. Motherboard, Bios, and if present, System Builder (Like Lenovo)." + print_screen_output "-M Show machine data. Motherboard, Bios, and if present, System Builder (Like Lenovo)." print_screen_output "-n Show Advanced Network card information. Same as -Nn. Shows interface, speed, mac id, state, etc." print_screen_output "-N Show Network card information. With -x, shows PCI BusID, Port number." print_screen_output "-o Show unmounted partition information (includes UUID and LABEL if available)." @@ -1828,24 +1828,24 @@ show_options() 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 " Supported levels: 0-${VERBOSITY_LEVELS} Example: $SCRIPT_NAME -v 4" - print_screen_output " 0 - short output, same as: $SCRIPT_NAME" - print_screen_output " 1 - basic verbose, same as: $SCRIPT_NAME -d" + print_screen_output " 0 - Short output, same as: $SCRIPT_NAME" + print_screen_output " 1 - Basic verbose, same as: $SCRIPT_NAME -d" print_screen_output " 2 - Also show networking card data" print_screen_output " 3 - Also show hard disk names as detected." print_screen_output " 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot" print_screen_output " 5 - For multicore systems, also shows: per core clock speeds; audio card; full disk data." print_screen_output "-x Show extra data (only works with verbose or line output, not short form): " print_screen_output " -C - bogomips on Cpu;" - print_screen_output " -N -A - adds version/port(s)/driver version (if available) for Network/Audio;" - print_screen_output " -N -A -G - network, audio, graphics, shows PCI Bus ID/Usb ID number of card;" + print_screen_output " -N -A - Adds version/port(s)/driver version (if available) for Network/Audio;" + print_screen_output " -N -A -G - Network, audio, graphics, shows PCI Bus ID/Usb ID number of card;" print_screen_output " -S - Desktop toolkit if avaliable (GNOME/XFCE/KDE only)" print_screen_output " -G - Direct rendering status for Graphics (in X)." print_screen_output " -G - (for single gpu, nvidia driver) screen number gpu is running on." - print_screen_output " -D - Hdd temp with disk data if you have hddtemp installed, if you are root OR if you have" - print_screen_output " added to /etc/sudoers (sudo v. 1.7 or newer): ALL = NOPASSWD: /usr/sbin/hddtemp (sample)" + print_screen_output " -D - Hdd temp with disk data if you have hddtemp installed, if you are root OR if you have added to" + print_screen_output " /etc/sudoers (sudo v. 1.7 or newer): ALL = NOPASSWD: /usr/sbin/hddtemp (sample)" print_screen_output " -t - Adds memory use output to cpu (-xt c), and cpu use to memory (-xt m)." print_screen_output "-xx Show extra, extra data (only works with verbose or line output, not short form): " - print_screen_output " -m - Adds chassis type, if any data for that is available." + print_screen_output " -M - Adds chassis information, if any data for that is available." print_screen_output "-z Adds security filters for IP addresses, Mac, and user home directory name. Default on for irc clients." print_screen_output "-Z Absolute override for output filters. Useful for debugging networking issues in irc for example." print_screen_output " "