From 90e5098565d34b0f829681036f1791eaf5b2badf Mon Sep 17 00:00:00 2001
From: inxi-svn <inxi-svn@techpatterns.com>
Date: Sat, 18 Jun 2011 03:29:49 +0000
Subject: [PATCH] arg cleanup

---
 inxi | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/inxi b/inxi
index 4db7803..35ee71b 100755
--- a/inxi
+++ b/inxi
@@ -3,7 +3,7 @@
 ####  Script Name: inxi
 ####  version: 1.6.10
 ####  Date: June 17 2011
-####  Patch Number: 10
+####  Patch Number: 11
 ########################################################################
 ####  SPECIAL THANKS
 ########################################################################
@@ -244,6 +244,7 @@ B_SHOW_ADVANCED_NETWORK='false'
 B_SHOW_AUDIO='false'
 B_SHOW_BASIC_CPU='false'
 B_SHOW_BASIC_DISK='false'
+B_SHOW_BASIC_OPTICAL='false'
 B_SHOW_CPU='false'
 B_SHOW_DISK_TOTAL='false'
 B_SHOW_DISK='false'
@@ -1810,6 +1811,7 @@ get_parameters()
 			F)	B_EXTRA_DATA='true'
 				B_SHOW_ADVANCED_NETWORK='true'
 				B_SHOW_AUDIO='true'
+				B_SHOW_BASIC_OPTICAL='true'
 				B_SHOW_CPU='true'
 				B_SHOW_DISK='true'
 				B_SHOW_GRAPHICS='true'
@@ -2113,7 +2115,7 @@ show_options()
 	print_screen_output "    6 - Adds full partition data (-p), unmounted partition data (-o), optical drive data (-d)."
 	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 "    -d - Adds drive features line to optical drive; adds rev version to optical drive."
+	print_screen_output "    -d - Adds items to features line of optical drive; adds rev version to optical drive."
 	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)"
@@ -2123,7 +2125,6 @@ show_options()
 	print_screen_output "         /etc/sudoers (sudo v. 1.7 or newer): <username> 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 "    -d - Adds some optical drive features, like state."
 	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."
@@ -6341,7 +6342,7 @@ print_hard_disk_data()
 		print_screen_output "$hdd_data"
 		Line_Starter=' '
 	fi
-	if [[ $B_SHOW_OPTICAL_DRIVES == 'true' ]];then
+	if [[ $B_SHOW_OPTICAL_DRIVES == 'true' || $B_SHOW_BASIC_OPTICAL == 'true' ]];then
 		print_optical_drive_data
 	fi
 
@@ -6820,7 +6821,7 @@ print_optical_drive_data()
 			# 12 - dvdr
 			# 13 - dvdram
 			# 14 - state
-			if [[ $B_EXTRA_DATA == 'true' ]];then
+			if [[ $B_SHOW_OPTICAL_DRIVES == 'true' ]];then
 				if [[ -z ${a_drives[5]} ]];then
 					speed='N/A'
 				else
@@ -6849,7 +6850,7 @@ print_optical_drive_data()
 				else
 					dvd='no'
 				fi
-				if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
+				if [[ $B_EXTRA_DATA == 'true' ]];then
 					if [[ -z ${a_drives[14]} ]];then
 						state='N/A'
 					else