From ef18c490e48919a79658ff18b450bf6c5b597117 Mon Sep 17 00:00:00 2001
From: Benjamin Bentmann <bentmann@apache.org>
Date: Tue, 13 Jan 2009 18:18:03 +0000
Subject: [PATCH] o Made bootstrap smart enough to use correct maven home path
 regardless of user input

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@734204 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index 8c3e6562b2..b15c13b468 100644
--- a/build.xml
+++ b/build.xml
@@ -58,14 +58,14 @@ END SNIPPET: ant-bootstrap -->
 
   <target name="init" depends="isMavenHomeSet">
     <xmlproperty prefix="pom" file="pom.xml"/>    
-    <basename file="${maven.home}" property="maven.home.basename"/>
     <dirname file="${maven.home}" property="maven.home.dirname"/>
     <!-- Initialize properties -->
     <property name="maven.home.basename.expected" value="apache-maven-${pom.project.version}"/>
+    <property name="maven.home.effective" location="${maven.home.dirname}/${maven.home.basename.expected}"/>
     <property name="maven.assembly" location="apache-maven/target/${maven.home.basename.expected}-bin.zip"/>
     <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
     <property name="surefire.useFile" value="true"/>    
-    <echo>maven.home = ${maven.home}</echo>
+    <echo>maven.home = ${maven.home.effective}</echo>
   </target>
 
   <target name="clean-bootstrap" description="cleans up generated bootstrap classes">
@@ -218,11 +218,11 @@ END SNIPPET: ant-bootstrap -->
   <target name="extract-assembly" depends="init,maven-assembly" description="extracts the maven assembly into maven.home">
     <echo>Extracting assembly to ${maven.home.dirname} ...</echo>
     <!-- If we are starting from scratch make sure the directory is created -->
-    <delete dir="${maven.home}"/>
-    <mkdir dir="${maven.home}"/>
+    <delete dir="${maven.home.effective}"/>
+    <mkdir dir="${maven.home.effective}"/>
     <unzip src="${maven.assembly}" dest="${maven.home.dirname}"/>
     <chmod perm="+x">
-      <fileset dir="${maven.home}/bin">
+      <fileset dir="${maven.home.effective}/bin">
         <include name="mvn"/>
       </fileset>
     </chmod>