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

bug fix

Browse source
This commit is contained in:
Harald Hope 2017-07-24 21:22:07 -07:00
parent 847ba186a0
commit 20ece4a732
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
inxi
View file

@ -1,8 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### Version: 2.3.25 #### Version: 2.3.24
#### Date: 2017-07-24 #### Date: 2017-07-23
#### Patch Number: 00 #### Patch Number: 00
######################################################################## ########################################################################
#### SPECIAL THANKS #### SPECIAL THANKS
@ -6332,7 +6332,7 @@ get_graphics_card_data()
# cards are either the same or different. We want only the .0 version as a valid # cards are either the same or different. We want only the .0 version as a valid
# card. .1 would be for example: Display Adapter with bus id x:xx.1, not the right one # card. .1 would be for example: Display Adapter with bus id x:xx.1, not the right one
/vga compatible controller|3D controller|Display controller/ { /vga compatible controller|3D controller|Display controller/ {
driver="" trueCard=""
gsub(/'"$BAN_LIST_NORMAL"'/, "", $NF) gsub(/'"$BAN_LIST_NORMAL"'/, "", $NF)
gsub(/'"$BAN_LIST_ARRAY"'/, " ", $NF) gsub(/'"$BAN_LIST_ARRAY"'/, " ", $NF)
gsub(/^ +| +$/, "", $NF) gsub(/^ +| +$/, "", $NF)
@ -8703,7 +8703,7 @@ get_partition_data()
# added devfs linprocfs sysfs fdescfs which show on debian kfreebsd kernel output # added devfs linprocfs sysfs fdescfs which show on debian kfreebsd kernel output
if [[ -z $BSD_TYPE ]];then if [[ -z $BSD_TYPE ]];then
swap_data="$( swapon -s 2>/dev/null )" swap_data="$( swapon -s 2>/dev/null )"
df_string=' --exclude-type=aufs --exclude-type=devfs --exclude-type=devtmpfs df_string='df -h -T -P --exclude-type=aufs --exclude-type=devfs --exclude-type=devtmpfs
--exclude-type=fdescfs --exclude-type=iso9660 --exclude-type=linprocfs --exclude-type=procfs --exclude-type=fdescfs --exclude-type=iso9660 --exclude-type=linprocfs --exclude-type=procfs
--exclude-type=squashfs --exclude-type=sysfs --exclude-type=tmpfs --exclude-type=unionfs' --exclude-type=squashfs --exclude-type=sysfs --exclude-type=tmpfs --exclude-type=unionfs'
else else
@ -8716,6 +8716,7 @@ get_partition_data()
df_string='df -h' df_string='df -h'
fi fi
fi fi
main_partition_data="$( eval $df_string )" main_partition_data="$( eval $df_string )"
# set dev disk label/mapper/uuid data globals # set dev disk label/mapper/uuid data globals
get_partition_dev_data 'label' get_partition_dev_data 'label'
@ -11459,7 +11460,6 @@ get_unmounted_partition_data()
a_unmounted_working=( ${A_PARTITION_DATA[i]} ) a_unmounted_working=( ${A_PARTITION_DATA[i]} )
IFS="$ORIGINAL_IFS" IFS="$ORIGINAL_IFS"
if [[ -n ${a_unmounted_working[6]} ]];then if [[ -n ${a_unmounted_working[6]} ]];then
# for remote mounts, the path would be: [domain|ip]:/path/in/remote
mounted_partitions="$mounted_partitions$separator${a_unmounted_working[6]//\//\\/}" mounted_partitions="$mounted_partitions$separator${a_unmounted_working[6]//\//\\/}"
fi fi
done done