From e4cef81a8aabfa448829247a3044f844574e23a2 Mon Sep 17 00:00:00 2001
From: inxi-svn <inxi-svn@techpatterns.com>
Date: Sat, 1 Nov 2008 21:55:12 +0000
Subject: [PATCH] Made -v3 show hard disk names, and -v2 networking
 information, this gives 3 an actual function, which it didn't have before.

Updated help to show this.
---
 inxi | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/inxi b/inxi
index d910085..409f4b5 100755
--- a/inxi
+++ b/inxi
@@ -1,7 +1,7 @@
 #!/bin/bash
 ########################################################################
 ####  Script Name: inxi
-####  version: 0.3.2
+####  version: 0.3.3
 ####  Date: November 1 2008
 ########################################################################
 ####  inxi is a fork of infobash, the original bash sys info script by locsmif
@@ -498,9 +498,10 @@ show_options()
 	print_screen_output "    Supported levels: 0-${VERBOSITY_LEVELS} Example: $SCRIPT_NAME -v 4"
 	print_screen_output "    0 - short output, same as using nothing: $SCRIPT_NAME"
 	print_screen_output "    1 - basic verbose, same as: $SCRIPT_NAME -d"
-	print_screen_output "    2,3 - Show networking card data; Show hard disk names as detected."
-	print_screen_output "    4 - Show partition size/filled data for (if present):/, /home, /var/, /boot"
-	print_screen_output "    5 - For multicore systems, show per core clock speeds."
+	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 show per core clock speeds."
 	print_screen_output "-V  $SCRIPT_NAME version information. Prints information then exits."
 	print_screen_output ""
 }
@@ -1400,7 +1401,7 @@ print_hard_disk_data()
 	local root_home_data="$( df -h -T | egrep '(/|/boot|/var|/home)$'  | C1=${C1} C2=${C2} awk '{print ENVIRON["C1"]"Partition:"ENVIRON["C2"], $7, ENVIRON["C1"]"- ", ENVIRON["C1"]"size:"ENVIRON["C2"], $3, ENVIRON["C1"]"used:"ENVIRON["C2"], $4, "(", $6, ")"}' )"
 	root_home_data=$( echo $root_home_data ) # get rid of linebreaks
 
-	if [ "$VERBOSITY_LEVEL" -ge 2 ];then
+	if [ "$VERBOSITY_LEVEL" -ge 3 ];then
 		hdd_data=$( create_print_line "Disks:" "${C1}HDD${C2}${hdd_model} ${C1}Size${C2} ${hdd_capacity} (${hdd_used})${CN}" )
 	else
 		hdd_data=$( create_print_line "Disks:" "${C1}HDD Size${C2} ${hdd_capacity} (${hdd_used})${CN}" )