From: thijs <thijs@b513b33f-fedd-0310-b452-c3deb5f4c849>
Date: Thu, 2 Aug 2007 12:01:03 +0000 (+0000)
Subject: * gpg-mailkeys:
X-Git-Url: https://git.sthu.org/?a=commitdiff_plain;h=a59645dc9de7a89a9e3bce92be61f75d2498eb9d;p=pgp-tools.git

* gpg-mailkeys:
  + Resolve bashisms in gpg-mailkeys.

git-svn-id: svn://svn.debian.org/pgp-tools/trunk@343 b513b33f-fedd-0310-b452-c3deb5f4c849
---

diff --git a/debian/changelog b/debian/changelog
index cfe10cf..854e4ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,9 +14,11 @@ signing-party (0.4.11-2) UNRELEASED; urgency=low
   * caff:
     + Add filename to one of the MIME parts as its absence breaks certain virus
       scanners.
+  * gpg-mailkeys:
+    + Resolve bashisms in gpg-mailkeys.
   * Cleanup package dependencies.
 
- -- Thijs Kinkhorst <thijs@debian.org>  Thu,  2 Aug 2007 12:12:02 +0200
+ -- Thijs Kinkhorst <thijs@debian.org>  Thu, 02 Aug 2007 14:01:21 +0200
 
 signing-party (0.4.11-1) unstable; urgency=low
 
diff --git a/gpg-mailkeys/gpg-mailkeys b/gpg-mailkeys/gpg-mailkeys
index d9ca259..f274aa5 100755
--- a/gpg-mailkeys/gpg-mailkeys
+++ b/gpg-mailkeys/gpg-mailkeys
@@ -9,8 +9,8 @@ set -e
 VERSION='$Rev$'
 
 if [ -z "$*" ]; then
-	echo "Send people their newly signed GPG key by mail."
-	echo "Usage: $0 keyid ..."
+	printf "Send people their newly signed GPG key by mail.\n"
+	printf "Usage: $0 keyid ...\n"
 	exit 1
 fi
 
@@ -38,20 +38,21 @@ fi
 FAILKEYS=
 
 while [ -n "$1" ]; do
-	echo -n "[$1] "
+	printf "[$1] "
 	TEMPFILE=`mktemp -t gpg2mail.XXXXXX`
 	ADDR=`gpg --with-colons --fixed-list-mode --list-key $1 | sed -e 's/^uid:[^re][^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:\([^:<]*<[^:>]*>\):.*/@@uid@@ \1/' -e '/^@@uid@@ /!d' -e 's/([^)]*)//g' -e 's/  */ /g' -e 's/^@@uid@@ //' | head -1`
 	if [ -z "$ADDR" ]; then
-		echo "(no usable user ids)"
+		printf "(no usable user ids)\n"
 		FAILKEYS="$FAILKEYS:$1"
 		shift 1
 		continue
 	fi
-	BOUNDARY="ksp-$$-boundary-$RANDOM"
+	NANOTIME=`date +%s-%N`
+	BOUNDARY="ksp-$$-boundary-$NANOTIME"
 	
-	echo -n "$ADDR:"
+	printf "$ADDR:"
 	if [ $FROM ]; then
-		echo >$TEMPFILE "From: $NAME <$FROM>"
+		printf >$TEMPFILE "From: $NAME <$FROM>\n"
 	fi
 cat << EOM >> $TEMPFILE
 To: $ADDR
@@ -75,7 +76,7 @@ $TEXT
 EOM
 
 if [ -f ~/.signature ]; 
-	then echo "--=20" >> $TEMPFILE 
+	then printf "--=20\n" >> $TEMPFILE 
 	cat ~/.signature >> $TEMPFILE
 fi
 
@@ -89,15 +90,14 @@ Content-Disposition: attachment; filename="$1.asc"
 
 --$BOUNDARY--
 EOM
-	echo -n " sending"
+	printf " sending"
 	/usr/sbin/sendmail -ti <$TEMPFILE
 	rm $TEMPFILE
-	echo " done."
+	printf " done.\n"
 	shift 1
 done
 
 if [ -n "$FAILKEYS" ]; then
-	echo
-	echo "Note: The following keys could not be sent:"
-	echo "$FAILKEYS" | tr ':' '\n' | sed -e '/^ *$/d' -e 's/^/  /'
+	printf "\nNote: The following keys could not be sent:\n"
+	printf "$FAILKEYS\n" | tr ':' '\n' | sed -e '/^ *$/d' -e 's/^/  /'
 fi