Return-Path: 
 <notifications-return-8930-apmail-ant-notifications-archive=ant.apache.org@ant.apache.org>
Delivered-To: apmail-ant-notifications-archive@minotaur.apache.org
Received: (qmail 77325 invoked from network); 19 Jul 2009 12:12:19 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 19 Jul 2009 12:12:19 -0000
Received: (qmail 71481 invoked by uid 500); 19 Jul 2009 12:13:24 -0000
Delivered-To: apmail-ant-notifications-archive@ant.apache.org
Received: (qmail 71408 invoked by uid 500); 19 Jul 2009 12:13:24 -0000
Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:notifications-help@ant.apache.org>
List-Unsubscribe: <mailto:notifications-unsubscribe@ant.apache.org>
List-Post: <mailto:notifications@ant.apache.org>
List-Id: <notifications.ant.apache.org>
Reply-To: dev@ant.apache.org
Delivered-To: mailing list notifications@ant.apache.org
Received: (qmail 71399 invoked by uid 99); 19 Jul 2009 12:13:24 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 19 Jul 2009 12:13:24 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 19 Jul 2009 12:13:21 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 530B923888D2; Sun, 19 Jul 2009 12:13:00 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r795524 - /ant/ivy/updatesite/trunk/build.xml
Date: Sun, 19 Jul 2009 12:13:00 -0000
To: notifications@ant.apache.org
From: hibou@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090719121300.530B923888D2@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: hibou
Date: Sun Jul 19 12:12:59 2009
New Revision: 795524

URL: http://svn.apache.org/viewvc?rev=795524&view=rev
Log:
Make the installation of the ivyde distrib work as there is now a folder in the zip

Modified:
    ant/ivy/updatesite/trunk/build.xml

Modified: ant/ivy/updatesite/trunk/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/updatesite/trunk/build.xml?rev=795524&r1=795523&r2=795524&view=diff
==============================================================================
--- ant/ivy/updatesite/trunk/build.xml (original)
+++ ant/ivy/updatesite/trunk/build.xml Sun Jul 19 12:12:59 2009
@@ -149,9 +149,17 @@
         <!-- unzip -->
         <mkdir dir="${work.dir}/distrib" />
         <unzip src="${ivyde.zip}" dest="${work.dir}/distrib" />
+        <!-- get the path to the ivyde folder -->
+        <path id="ivyde.distrib.path.id">
+            <first count="1">
+                <fileset dir="${work.dir}/distrib" includes="*" />
+            </first>
+        </path>
+        <!-- turn the path into a property -->
+        <property name="ivyde.distrib.path" refid="ivyde.distrib.path.id" />
         <!-- install the new binaries -->
         <copy todir="${updatesite.dir}">
-            <fileset dir="${work.dir}/distrib">
+            <fileset dir="${ivyde.distrib.path}">
                 <include name="plugins/**" />
                 <include name="features/**" />
             </fileset>