pld-builder.new: client/make-request.sh - avoid \n expanding in $command ev...
glen
glen at pld-linux.org
Thu Feb 4 12:59:22 CET 2010
Author: glen Date: Thu Feb 4 11:59:22 2010 GMT
Module: pld-builder.new Tag: HEAD
---- Log message:
- avoid \n expanding in $command everywhere it is echoed out
---- Files affected:
pld-builder.new/client:
make-request.sh (1.64 -> 1.65)
---- Diffs:
================================================================
Index: pld-builder.new/client/make-request.sh
diff -u pld-builder.new/client/make-request.sh:1.64 pld-builder.new/client/make-request.sh:1.65
--- pld-builder.new/client/make-request.sh:1.64 Thu Feb 4 12:42:49 2010
+++ pld-builder.new/client/make-request.sh Thu Feb 4 12:59:17 2010
@@ -222,7 +222,7 @@
--command | -c )
command="$2"
- if [ $command = - ]; then
+ if [ "$command" = - ]; then
echo >&2 "Reading command from STDIN"
echo >&2 "---"
command=$(cat)
@@ -391,7 +391,9 @@
bid=$(uuidgen)
echo -E >&2 "* Command: $command"
echo " <batch id='$bid' depends-on=''>"
- echo " <command flags='$command_flags'>$(echo -E "$command" | sed -e 's,&,\&,g;s,<,\<,g;s,>,\>,g')</command>"
+ echo " <command flags='$command_flags'>"
+ echo -E "$command" | sed -e 's,&,\&,g;s,<,\<,g;s,>,\>,g'
+ echo "</command>"
echo " <info></info>"
for b in $builders; do
echo >&2 "* Builder: $b"
@@ -462,7 +464,7 @@
X-New-PLD-Builder: request
X-Requester-Version: \$Id$
-$(echo "$req" | gpg --clearsign --default-key $default_key $gpg_opts)
+$(echo -E "$req" | gpg --clearsign --default-key $default_key $gpg_opts)
EOF
}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/client/make-request.sh?r1=1.64&r2=1.65&f=u
More information about the pld-cvs-commit
mailing list