commit c486b45ac27817fa67714d062cdbd2c976fa453a parent 11e9bc9287335846d86b1b2d142836312859acdb Author: Jaromil <jaromil@dyne.org> Date: Mon, 5 May 2014 09:46:59 +0200 fix to merge on maildir dirs with spaces in their name Diffstat:
| M | src/zlibs/maildirs | | | 15 | +++++++++------ |
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/zlibs/maildirs b/src/zlibs/maildirs @@ -178,22 +178,25 @@ merge() { notice "Merging maildir ${src} into ${dst}" c=0 - for i in `${=find} "${src}/cur" -type f`; do - mv $i "${dst}/cur/"; c=$(($c + 1)) + fr=`${=find} ${src}/cur -type f` + for i in ${(f)fr}; do + mv "$i" "${dst}/cur/"; c=$(($c + 1)) { test $? = 0 } || { error "error moving file: $i" error "merge aborted." return 1 } done - for i in `${=find} "${src}/new" -type f`; do - mv $i "${dst}/new/"; c=$(($c + 1)) + fr=`${=find} ${src}/new -type f` + for i in ${(f)fr}; do + mv "$i" "${dst}/new/"; c=$(($c + 1)) { test $? = 0 } || { error "error moving file: $i" error "merge aborted." return 1 } done - for i in `${=find} "${src}/tmp" -type f`; do - mv $i "${dst}/tmp/"; c=$(($c + 1)) + fr=`${=find} ${src}/tmp -type f` + for i in ${(f)fr}; do + mv "$i" "${dst}/tmp/"; c=$(($c + 1)) { test $? = 0 } || { error "error moving file: $i" error "merge aborted."