From 3495f4b72ce576ddb8e1abdf6fe62472b76048d5 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Wed, 23 Sep 2009 15:40:55 +0000
Subject: [PATCH] use a single get task in macro

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@818144 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/CoreTasks/get.html | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/docs/manual/CoreTasks/get.html b/docs/manual/CoreTasks/get.html
index 533afa4ed..e15578fc9 100644
--- a/docs/manual/CoreTasks/get.html
+++ b/docs/manual/CoreTasks/get.html
@@ -176,9 +176,17 @@ the <a href="input.html">input task</a> to query for a password.</p>
   &lt;macrodef name="get-and-checksum">
     &lt;attribute name="url"/>
     &lt;attribute name="dest"/>
-    &lt;sequential>
-      &lt;get src="@{url}" dest="@{dest}"/>
-      &lt;get src="@{url}.sha1" dest="@{dest}.sha"/>
+    &lt;sequential&gt;
+      &lt;local name="destdir"/&gt;
+      &lt;dirname property="destdir" file="@{dest}"/&gt;
+      &lt;get dest="${destdir}"&gt;
+        &lt;url url="@{url}"/&gt;
+        &lt;url url="@{url}.sha1"/&gt;
+        &lt;firstmatchmapper&gt;
+          &lt;globmapper from="@{url}.sha1" to="@{dest}.sha"/&gt;
+          &lt;globmapper from="@{url}" to="@{dest}"/&gt;
+        &lt;/firstmatchmapper&gt;
+      &lt;/get&gt;
       &lt;local name="checksum.matches"/>
       &lt;local name="checksum.matches.fail"/>
       &lt;checksum file="@{dest}" algorithm="sha" fileext=".sha"