dmitriy.kazimirov/inxi
1
0
Fork 0
mirror of https://github.com/smxi/inxi.git synced 2024-11-17 00:31:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tweak

Browse source
This commit is contained in:
inxi-svn 2011-06-18 00:46:41 +00:00
parent b2ee1f160e
commit 8d89081fe4
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
inxi
View file

@ -3,7 +3,7 @@
#### Script Name: inxi #### Script Name: inxi
#### version: 1.6.10 #### version: 1.6.10
#### Date: June 17 2011 #### Date: June 17 2011
#### Patch Number: 03 #### Patch Number: 04
######################################################################## ########################################################################
#### SPECIAL THANKS #### SPECIAL THANKS
######################################################################## ########################################################################
@ -4550,8 +4550,11 @@ get_optical_drive_data()
elif [[ -e /proc/ide/$disk/model ]];then elif [[ -e /proc/ide/$disk/model ]];then
vendor=$( cat /proc/ide/$disk/model 2>/dev/null | sed 's/^[[:space:]]\+//;s/[[:space:]]\+$//' ) vendor=$( cat /proc/ide/$disk/model 2>/dev/null | sed 's/^[[:space:]]\+//;s/[[:space:]]\+$//' )
fi fi
if [[ $B_EXTRA_DATA == 'true' ]];then
proc_cdrom="$( cat /proc/sys/dev/cdrom/info 2>/dev/null )" proc_cdrom="$( cat /proc/sys/dev/cdrom/info 2>/dev/null )"
fi
item_string="$item_string,$vendor,$model,$rev_number" item_string="$item_string,$vendor,$model,$rev_number"
echo $item_string echo $item_string
done done
@ -6694,8 +6697,6 @@ print_optical_drive_data()
if [[ -z $drive_links ]];then if [[ -z $drive_links ]];then
drive_links='N/A' drive_links='N/A'
fi fi
if [[ -n ${a_drives[2]} ]];then if [[ -n ${a_drives[2]} ]];then
vendor=${a_drives[2]} vendor=${a_drives[2]}
if [[ -n ${a_drives[3]} ]];then if [[ -n ${a_drives[3]} ]];then
@ -6703,12 +6704,21 @@ print_optical_drive_data()
fi fi
fi fi
if [[ -z $vendor ]];then if [[ -z $vendor ]];then
if [[ -n ${a_drives[3]} ]];then
vendor=${a_drives[3]}
else
vendor='N/A' vendor='N/A'
fi fi
fi
drive_data="${C1}Optical${counter}:${C2} $drive_id ${C1}model:${C2} $vendor ${C1}dev-links:${C2} $drive_links" drive_data="${C1}Optical${counter}:${C2} $drive_id ${C1}model:${C2} $vendor ${C1}dev-links:${C2} $drive_links"
drive_data=$( create_print_line "$Line_Starter" "$drive_data" ) drive_data=$( create_print_line "$Line_Starter" "$drive_data" )
print_screen_output "$drive_data" print_screen_output "$drive_data"
Line_Starter=' ' Line_Starter=' '
if [[ $B_EXTRA_DATA == 'true' ]];then
drive_data="${C1}Features:${C2} "
drive_data=$( create_print_line "$Line_Starter" "$drive_data" )
print_screen_output "$drive_data"
fi
done done
else else
: :