From e19fe8b4f41506e334c61f371be40b1f7ea65995 Mon Sep 17 00:00:00 2001
From: Marianne Chevrot <blackmoor@devys.org>
Date: Sun, 12 Aug 2018 21:41:39 +0200
Subject: Fix renaming to an already existing name

---
 bulkrename | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bulkrename b/bulkrename
index a1f196e..a488381 100755
--- a/bulkrename
+++ b/bulkrename
@@ -28,9 +28,9 @@ fi
 sed -i -- 's/\([\\"$`]\)/\\\1/g;' "${namebase}.1" "${namebase}.2"
 
 (echo '# Please review/modify this script or empty it to do nothing' \
-    ; paste -d "\n" -- "${namebase}.1" "${namebase}.2" \
-    | uniq -c \
-    | sed -n 's/^ *1 \(.*\)$/"\1"/p' \
+    ; comm -3 --output-delimiter="" "${namebase}.1" "${namebase}.2" \
+    | tr -d '\0' \
+    | sed 's/^.*$/"&"/' \
     | xargs -d"\n" -L2 echo 'mv -i --') \
     > "${namebase}.sh"
 
-- 
cgit v1.2.3