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:08:23 UTC
[1/2] ant git commit: fix 60150 values containing backtick or $
character cause shell error on *nix
Repository: ant
Updated Branches:
refs/heads/master b37d64d02 -> a50633c17
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/26d8c5ff
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/26d8c5ff
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/26d8c5ff
Branch: refs/heads/master
Commit: 26d8c5ff244144e679d699deededf3ac33cab23d
Parents: b37d64d
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:03:17 2016 +0200
----------------------------------------------------------------------
src/script/ant | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/26d8c5ff/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
[2/2] 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/a50633c1
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/a50633c1
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/a50633c1
Branch: refs/heads/master
Commit: a50633c1757043502636d1702d6d40602ae3cbc7
Parents: 26d8c5f
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:06:53 2016 +0200
----------------------------------------------------------------------
WHATSNEW | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/a50633c1/WHATSNEW
----------------------------------------------------------------------
diff --git a/WHATSNEW b/WHATSNEW
index 7cc851b..ee30366 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -64,6 +64,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:
--------------