From 68677c92784a2f03474a6335e25935f9ff3f085b Mon Sep 17 00:00:00 2001 From: inxi-svn Date: Fri, 3 May 2013 22:45:16 +0000 Subject: [PATCH] New version, new tarball. Made separators surround the partition id, that avoids any possible errors with detections, also added in missing detection for separator. --- inxi | 10 +++++----- inxi.changelog | 12 ++++++++++++ 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/inxi b/inxi index 9baa9f6..e0a2c7e 100755 --- a/inxi +++ b/inxi @@ -1,7 +1,7 @@ #!/usr/bin/env bash ######################################################################## #### Script Name: inxi -#### Version: 1.8.46 +#### Version: 1.8.47 #### Date: May 3 2013 #### Patch Number: 00 ######################################################################## @@ -4953,17 +4953,17 @@ get_hdd_data_basic() # this also protects against cases where the mount point has a space in the # file name, thus breaking going down from $NF directly. if ( $5 ~ /.*%/ ) { - if ( partitionsSet !~ /.*~$6.*/ ) { + if ( partitionsSet !~ /.*~$6~.*/ ) { used += $3 } - partitionsSet = partitionsSet "~" $6 + partitionsSet = partitionsSet "~" $6 "~" } # otherwise use standard else if ( $6 ~ /.*%/ ) { - if ( partitionsSet !~ /.*$7.*/ ) { + if ( partitionsSet !~ /.*~$7~.*/ ) { used += $4 } - partitionsSet = partitionsSet "~" $7 + partitionsSet = partitionsSet "~" $7 "~" } # and if this is not detected, give up, we need user data to debug else { diff --git a/inxi.changelog b/inxi.changelog index edbfd0e..ffd409e 100755 --- a/inxi.changelog +++ b/inxi.changelog @@ -1,3 +1,15 @@ +===================================================================================== +Version: 1.8.47 +Patch Version: 00 +Script Date: May 3 2013 +----------------------------------- +Changes: +----------------------------------- +New version, new tarball. Made separators surround the partition id, that avoids any possible +errors with detections, also added in missing detection for separator. +----------------------------------- +-- Harald Hope - Fri, 03 May 2013 15:41:26 -0700 + ===================================================================================== Version: 1.8.46 Patch Version: 00