the 4.1.16 bug fix recreated the 1.4.15 bug fix issue, that is now corrected.

This commit is contained in:
inxi-svn 2010-09-29 16:36:24 +00:00
parent 106c4878f1
commit 0c3d35b650

8
inxi
View file

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### version: 1.4.16 #### version: 1.4.17
#### Date: September 26 2010 #### Date: September 29 2010
######################################################################## ########################################################################
#### SPECIAL THANKS #### SPECIAL THANKS
######################################################################## ########################################################################
@ -3153,7 +3153,7 @@ get_partition_data()
if [[ -n $( grep -E '(by-uuid|by-label)' <<< ${a_partition_working[6]} ) ]];then if [[ -n $( grep -E '(by-uuid|by-label)' <<< ${a_partition_working[6]} ) ]];then
if [[ -n $DEV_DISK_UUID ]];then if [[ -n $DEV_DISK_UUID ]];then
dev_item=$( echo "$DEV_DISK_UUID" | gawk ' dev_item=$( echo "$DEV_DISK_UUID" | gawk '
/'$( basename ${a_partition_working[6]} )'$/ { /'$( basename ${a_partition_working[6]} )'/ {
item=gensub( /..\/..\/(.+)/, "\\1", 1, $NF ) item=gensub( /..\/..\/(.+)/, "\\1", 1, $NF )
print item print item
}' ) }' )
@ -3161,7 +3161,7 @@ get_partition_data()
# if we didn't find anything for uuid try label # if we didn't find anything for uuid try label
if [[ -z $dev_item && -n $DEV_DISK_LABEL ]];then if [[ -z $dev_item && -n $DEV_DISK_LABEL ]];then
dev_item=$( echo "$DEV_DISK_LABEL" | gawk ' dev_item=$( echo "$DEV_DISK_LABEL" | gawk '
/'$( basename ${a_partition_working[6]} )'$/ { /'$( basename ${a_partition_working[6]} )'/ {
item=gensub( /..\/..\/(.+)/, "\\1", 1, $NF ) item=gensub( /..\/..\/(.+)/, "\\1", 1, $NF )
print item print item
}' ) }' )