# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1447634704 -7200
# Node ID 00ea9c70d0942ea879b0e544714a2d2023e2abcd
# Parent  2bdb7937e1fa59aad2a37c1e923c5f4d0a58b45c
tazlito: mergefs(): try to process filenames with spaces

diff -r 2bdb7937e1fa -r 00ea9c70d094 tazlito
--- a/tazlito	Mon Nov 16 01:31:30 2015 +0200
+++ b/tazlito	Mon Nov 16 02:45:04 2015 +0200
@@ -531,40 +531,44 @@
 # Remove duplicate files
 mergefs()
 {
-	echo -n "Merge $(basename $1) ($(du -hs $1 | awk '{ print $1}')) into "
-	echo -n       "$(basename $2) ($(du -hs $2 | awk '{ print $1}'))"
+	# Note, many packages have files with spaces in the name
+	IFS=$'\n'
+
+	echo -n "Merge $(basename "$1") ($(du -hs "$1" | awk '{ print $1}')) into "
+	echo -n       "$(basename "$2") ($(du -hs "$2" | awk '{ print $1}'))"
 	# merge symlinks files and devices
-	( cd $1; find ) | while read file; do
-		if [ -L $1/$file ]; then
-			[ -L $2/$file ] &&
-			[ "$(readlink $1/$file)" == "$(readlink $2/$file)" ] &&
-			rm -f $2/$file
-		elif [ -f $1/$file ]; then
-			[ -f $2/$file ] &&
-			cmp $1/$file $2/$file > /dev/null 2>&1 && rm -f $2/$file
-			[ -f $2/$file ] &&
-			[ "$(basename $file)" == "volatile.cpio.gz" ] &&
-			[ "$(dirname $(dirname $file))" == \
-			  ".$INSTALLED" ] && rm -f $2/$file
-		elif [ -b $1/$file ]; then
-			[ -b $2/$file ] &&
-			[ "$(stat -c '%a:%u:%g:%t:%T' $1/$file)" == \
-			  "$(stat -c '%a:%u:%g:%t:%T' $2/$file)" ] &&
-			rm -f $2/$file
-		elif [ -c $1/$file ]; then
-			[ -c $2/$file ] &&
-			[ "$(stat -c '%a:%u:%g:%t:%T' $1/$file)" == \
-			  "$(stat -c '%a:%u:%g:%t:%T' $2/$file)" ] &&
-			rm -f $2/$file
+	( cd "$1"; find ) | while read file; do
+		if [ -L "$1/$file" ]; then
+			[ -L "$2/$file" ] &&
+			[ "$(readlink "$1/$file")" == "$(readlink "$2/$file")" ] &&
+			rm -f "$2/$file"
+		elif [ -f "$1/$file" ]; then
+			[ -f "$2/$file" ] &&
+			cmp "$1/$file" "$2/$file" >/dev/null 2>&1 && rm -f "$2/$file"
+			[ -f "$2/$file" ] &&
+			[ "$(basename "$file")" == 'volatile.cpio.gz' ] &&
+			[ "$(dirname $(dirname "$file"))" == \
+			  ".$INSTALLED" ] && rm -f "$2/$file"
+		elif [ -b "$1/$file" ]; then
+			[ -b "$2/$file" ] &&
+			[ "$(stat -c '%a:%u:%g:%t:%T' "$1/$file")" == \
+			  "$(stat -c '%a:%u:%g:%t:%T' "$2/$file")" ] &&
+			rm -f "$2/$file"
+		elif [ -c "$1/$file" ]; then
+			[ -c "$2/$file" ] &&
+			[ "$(stat -c '%a:%u:%g:%t:%T' "$1/$file")" == \
+			  "$(stat -c '%a:%u:%g:%t:%T' "$2/$file")" ] &&
+			rm -f "$2/$file"
 		fi
 	done
 
 	# cleanup directories
-	( cd $1; find . -type d ) | sed '1!G;h;$!d' | while read file; do
-		[ -d $2/$file ] && rmdir $2/$file 2> /dev/null
+	( cd "$1"; find . -type d ) | sed '1!G;h;$!d' | while read file; do
+		[ -d "$2/$file" ] && rmdir "$2/$file" 2>/dev/null
 	done
 	true
 	status
+	unset IFS
 }
 
 cleanup_merge()