dmitriy.kazimirov/inxi
1
0
Fork 0
mirror of https://github.com/smxi/inxi.git synced 2025-02-07 13:32:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed testing bug for advanced sdx name detection

Browse source
This commit is contained in:
inxi-svn 2008-11-09 07:07:48 +00:00
parent d63f5d8d39
commit f96ab2c884
1 changed files with 38 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
inxi
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### version: 0.4.18 #### version: 0.4.19
#### Date: November 8 2008 #### Date: November 8 2008
######################################################################## ########################################################################
#### inxi is a fork of infobash, the original bash sys info script by locsmif #### inxi is a fork of infobash, the original bash sys info script by locsmif
@ -1244,11 +1244,10 @@ get_hard_drive_data_advanced()
## then handle libata names ## then handle libata names
# first get the ata device names, put them into an array # first get the ata device names, put them into an array
if [[ -e /proc/scsi/sg/device_strs ]]; then
IFS=$'\n' IFS=$'\n'
if [[ -e /proc/scsi/sg/device_strs && $B_TESTING_FLAG == 'true' ]]; then
## prints out hdd device if field one is ATA type (sata compatibility mode) or prints out scsi device ## prints out hdd device if field one is ATA type (sata compatibility mode) or prints out scsi device
# note: pmap handles usb mounted devices, which have a null first field # note: pmap handles usb mounted devices, which have a null first field
if [[ $B_TESTING_FLAG == 'true' ]];then
a_temp_scsi=( $( gawk -F'\t' ' a_temp_scsi=( $( gawk -F'\t' '
BEGIN { IGNORECASE=1 } BEGIN { IGNORECASE=1 }
# if the item starts with empty, void field, assume it is flash drive # if the item starts with empty, void field, assume it is flash drive
@ -1258,7 +1257,7 @@ get_hard_drive_data_advanced()
print $(NF -1) print $(NF -1)
} }
' /proc/scsi/sg/device_strs ) ) ' /proc/scsi/sg/device_strs ) )
else elif [[ -e /proc/scsi/scsi ]]; then
a_temp_scsi=( $( gawk ' a_temp_scsi=( $( gawk '
BEGIN { IGNORECASE=1 } BEGIN { IGNORECASE=1 }
/host/ { /host/ {
@ -1286,7 +1285,6 @@ get_hard_drive_data_advanced()
}' /proc/scsi/scsi) ) }' /proc/scsi/scsi) )
fi fi
IFS="$ORIGINAL_IFS" IFS="$ORIGINAL_IFS"
fi
## then we'll loop through that array looking for matches. Note, with identical drives this will fail, sigh.. ## then we'll loop through that array looking for matches. Note, with identical drives this will fail, sigh..
## for future use, that should be tightened up, but for now it's fine. ## for future use, that should be tightened up, but for now it's fine.