From 50c03668d1d81c93d9c540e6a8c45e604068cc45 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Tue, 3 Dec 2013 13:27:36 -0500
Subject: maidups: clean up using trap

---
 maildups.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/maildups.sh b/maildups.sh
index 9c78bd6..7f39a58 100644
--- a/maildups.sh
+++ b/maildups.sh
@@ -3,16 +3,16 @@
 
 maildir=$1
 
+msgid_file="$(mktemp --tmpdir "${0##*/}.XXXXXXXXXX")"
+trap "rm -f $(printf '%q' "$msgid_file")" EXIT
+
 echo -n 'Generating Message-ID table... '
-msgid_file=`mktemp`
 grep -rH -m1 '^[Mm]essage-[Ii][Dd]:' "$maildir"| \
-  sed -r 's/(.*):[Mm]essage-[Ii][Dd]:\s*(\S.*)/\2:\1/'| \
-  sort -n>"$msgid_file"
+	sed -r 's/(.*):[Mm]essage-[Ii][Dd]:\s*(\S.*)/\2:\1/'| \
+	sort -n>"$msgid_file"
 echo 'done'
 
 < "$msgid_file" sed 's/:.*//'|uniq -d|while read msgid; do
-    echo "Removing dups of $msgid"
-    < "$msgid_file" sed -n "s/^$msgid://p"|sed 1d|xargs -d'\n' rm -fv|sed 's/./  &/'
+	echo "Removing dups of $msgid"
+	< "$msgid_file" sed -n "s/^$msgid://p"|sed 1d|xargs -d'\n' rm -fv|sed 's/./  &/'
 done
-
-rm -f "$msgid_file"
-- 
cgit v1.2.3