pld-builder.new: client/make-request.sh - keep gpg stdin clear, so curses b...

[glen]

Author: glen                         Date: Mon Jun 11 14:40:40 2012 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
- keep gpg stdin clear, so curses based gpg-agent could work

---- Files affected:
pld-builder.new/client:
   make-request.sh (1.103 -> 1.104) 

---- Diffs:

================================================================
Index: pld-builder.new/client/make-request.sh
diff -u pld-builder.new/client/make-request.sh:1.103 pld-builder.new/client/make-request.sh:1.104
--- pld-builder.new/client/make-request.sh:1.103	Fri Apr  6 21:09:22 2012
+++ pld-builder.new/client/make-request.sh	Mon Jun 11 16:40:35 2012
@@ -757,21 +757,26 @@
 
 gen_email () {
 	# make request first, so the STDERR/STDOUT streams won't be mixed
-	local req=$(gen_req)
+	local tmp req
+	tmp=$(mktemp)
+	gen_req > $tmp
 
 	if [ "$verbose" = "yes" ]; then
-		echo >&2 -E "$req"
+		cat $tmp >&2
 	fi
-cat <<EOF
-From: $requester
-To: $builder_email
-Subject: build request
-Message-Id: <$id@$(hostname)>
-X-New-PLD-Builder: request
-X-Requester-Version: \$Id$
 
-$(echo -E "$req" | gpg --clearsign --default-key $default_key $gpg_opts)
-EOF
+	cat <<-EOF
+	From: $requester
+	To: $builder_email
+	Subject: build request
+	Message-Id: <$id@$(hostname)>
+	X-New-PLD-Builder: request
+	X-Requester-Version: \$Id$
+
+	EOF
+
+	gpg --clearsign --default-key $default_key $gpg_opts --output=- $tmp
+	rm -f $tmp
 }
 
 gen_email | send_request
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/pld-builder.new/client/make-request.sh?r1=1.103&r2=1.104