Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id CF641200B9D for ; Wed, 28 Sep 2016 21:08:27 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CE22C160AB8; Wed, 28 Sep 2016 19:08:27 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4DA7C160AD3 for ; Wed, 28 Sep 2016 21:08:27 +0200 (CEST) Received: (qmail 12199 invoked by uid 500); 28 Sep 2016 19:08:25 -0000 Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ant.apache.org Delivered-To: mailing list notifications@ant.apache.org Received: (qmail 12165 invoked by uid 99); 28 Sep 2016 19:08:23 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Sep 2016 19:08:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 140BDDFE61; Wed, 28 Sep 2016 19:08:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bodewig@apache.org To: notifications@ant.apache.org Date: Wed, 28 Sep 2016 19:08:23 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] ant git commit: fix 60150 values containing backtick or $ character cause shell error on *nix archived-at: Wed, 28 Sep 2016 19:08:28 -0000 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 Authored: Mon Sep 19 15:29:09 2016 -0400 Committer: Stefan Bodewig 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