From d979aafdfeea51cd3837e5156f6105a1e533b50f Mon Sep 17 00:00:00 2001 From: Mamoru Sakaue / MwGhennndo Date: Wed, 11 Jul 2018 02:35:16 +0800 Subject: [PATCH] Fixed again to fs_fix_unionfs_image_if_hidden (). Changes to be committed: modified: lib/libfs.sh modified: lib/libmain.sh --- lib/libfs.sh | 6 ++---- lib/libmain.sh | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/libfs.sh b/lib/libfs.sh index ab49417..bf43a53 100644 --- a/lib/libfs.sh +++ b/lib/libfs.sh @@ -157,16 +157,14 @@ fs_get_descendant_mount_info () # Use the side effect of find(1). fs_fix_unionfs_image_if_hidden () { - local needlepath needlepath_cur needlepath_next + local needlepath needlepath_cur needlepath=$1 needlepath_cur=$needlepath while : do [ -e "$needlepath_cur" ] && return find -dx "$needlepath_cur" -maxdepth 0 > /dev/null 2>&1 || : - needlepath_next=`dirname "$needlepath_cur"` - [ "x$needlepath_cur" = "x$needlepath_next" ] && break - needlepath_cur=$needlepath_next + needlepath_cur=`dirname "$needlepath_cur"` done [ -e "$needlepath" ] && return message_echo "ERROR: Lost mandatory file, probably due to the bug of unionfs: $needlepath" >&2 diff --git a/lib/libmain.sh b/lib/libmain.sh index f094484..c547045 100644 --- a/lib/libmain.sh +++ b/lib/libmain.sh @@ -12,7 +12,7 @@ main_set_version () MYVERSION=4.0.1 COMPATIBLE_VERSIONS='^(4\.[0]\.[0-1])$' # Template for development versions - MYVERSION=4.0.0+toward_4.0.1_20180711022824 + MYVERSION=4.0.0+toward_4.0.1_20180711023502 COMPATIBLE_VERSIONS='^(4\.[0]\.[0]|4\.[0]\.[0]+(|\+toward_4\.[0]\.[1]+_[0-9]+))$' } -- 2.11.0