From 20ece4a732543721cf0ba6a28671baaf6c3e903a Mon Sep 17 00:00:00 2001 From: Harald Hope Date: Mon, 24 Jul 2017 21:22:07 -0700 Subject: [PATCH] bug fix --- inxi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/inxi b/inxi index c9d4be5..255ddc9 100755 --- a/inxi +++ b/inxi @@ -1,8 +1,8 @@ #!/usr/bin/env bash ######################################################################## #### Script Name: inxi -#### Version: 2.3.25 -#### Date: 2017-07-24 +#### Version: 2.3.24 +#### Date: 2017-07-23 #### Patch Number: 00 ######################################################################## #### 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 # 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/ { - driver="" + trueCard="" gsub(/'"$BAN_LIST_NORMAL"'/, "", $NF) gsub(/'"$BAN_LIST_ARRAY"'/, " ", $NF) gsub(/^ +| +$/, "", $NF) @@ -8703,7 +8703,7 @@ get_partition_data() # added devfs linprocfs sysfs fdescfs which show on debian kfreebsd kernel output if [[ -z $BSD_TYPE ]];then 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=squashfs --exclude-type=sysfs --exclude-type=tmpfs --exclude-type=unionfs' else @@ -8716,6 +8716,7 @@ get_partition_data() df_string='df -h' fi fi + main_partition_data="$( eval $df_string )" # set dev disk label/mapper/uuid data globals get_partition_dev_data 'label' @@ -11459,7 +11460,6 @@ get_unmounted_partition_data() a_unmounted_working=( ${A_PARTITION_DATA[i]} ) IFS="$ORIGINAL_IFS" 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]//\//\\/}" fi done