You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2016/09/28 19:10:30 UTC
[1/3] ant git commit: fix 60150 values containing backtick or $
character cause shell error on *nix
Repository: ant
Updated Branches:
refs/heads/master a50633c17 -> c43870d45
fix 60150 values containing backtick or $ character cause shell error on *nix
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/ce684365
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/ce684365
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/ce684365
Branch: refs/heads/master
Commit: ce6843657c831248a3a3ca90ecb1d12d370d5a44
Parents: a3897d4
Author: Jeffrey Adamson <jw...@us.ibm.com>
Authored: Mon Sep 19 15:29:09 2016 -0400
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Wed Sep 28 21:09:05 2016 +0200
----------------------------------------------------------------------
src/script/ant | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/ce684365/src/script/ant
----------------------------------------------------------------------
diff --git a/src/script/ant b/src/script/ant
old mode 100644
new mode 100755
index 043f3fc..2276b7c
--- a/src/script/ant
+++ b/src/script/ant
@@ -35,8 +35,8 @@ for arg in "$@" ; do
if [ my"$arg" = my"-h" -o my"$arg" = my"-help" ] ; then
show_help=true
fi
- # wrap all arguments as "" strings, escape any internal back-slash or double-quote characters
- ant_exec_args="$ant_exec_args \"$(printf '%s\n' "$arg" | sed -e 's@"\|\\@\\\0@g' )\""
+ # wrap all arguments as "" strings, escape any internal back-slash, double-quote, $, or back-tick characters
+ ant_exec_args="$ant_exec_args \"$(printf '%s\n' "$arg" | sed -e 's@\$\|`\|"\|\\@\\\0@g' )\""
fi
done
[3/3] ant git commit: Merge branch '1.9.x'
Posted by bo...@apache.org.
Merge branch '1.9.x'
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/c43870d4
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/c43870d4
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/c43870d4
Branch: refs/heads/master
Commit: c43870d4523ec9d379a9aeda11f2ce45160d6102
Parents: a50633c 642a050
Author: Stefan Bodewig <bo...@apache.org>
Authored: Wed Sep 28 21:10:14 2016 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Wed Sep 28 21:10:14 2016 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/3] ant git commit: record fix for
https://bz.apache.org/bugzilla/show_bug.cgi?id=60150
Posted by bo...@apache.org.
record fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=60150
closes #24 thanks to @jwadamson
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/642a050e
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/642a050e
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/642a050e
Branch: refs/heads/master
Commit: 642a050e0f2ce8e7c55a41c2781cee63843ad9a1
Parents: ce68436
Author: Stefan Bodewig <bo...@apache.org>
Authored: Wed Sep 28 21:06:53 2016 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Wed Sep 28 21:09:36 2016 +0200
----------------------------------------------------------------------
WHATSNEW | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/642a050e/WHATSNEW
----------------------------------------------------------------------
diff --git a/WHATSNEW b/WHATSNEW
index 215f8cb..6eda90f 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -52,6 +52,10 @@ Fixed bugs:
* Clarified the documentation of <get>'s retries attribute.
Bugzilla Report 59930
+ * The ant wrapper script failed if backticks were passed on the
+ command line.
+ Bugzilla Report 60150, 59445
+
Other changes:
--------------