From 191c281ceb8290bbbc6b92bc8fe697aed055d988 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 10 Jun 2015 19:53:41 +1000 Subject: BUILDTOOLS-118: Check M2_HOME for Maven install and attempt to use it. I have a feeling this could break people already using BuildTools with a bad M2_HOME directory, but that's really their issue. --- src/main/java/org/spigotmc/builder/Builder.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/spigotmc/builder/Builder.java b/src/main/java/org/spigotmc/builder/Builder.java index 0968a9c..810cf3c 100644 --- a/src/main/java/org/spigotmc/builder/Builder.java +++ b/src/main/java/org/spigotmc/builder/Builder.java @@ -171,16 +171,21 @@ public class Builder clone( "https://hub.spigotmc.org/stash/scm/spigot/builddata.git", buildData ); } - File maven = new File( "apache-maven-3.2.5" ); + File maven = new File( System.getenv( "M2_HOME" ) ); if ( !maven.exists() ) { - System.out.println( "Maven does not exist, downloading. Please wait." ); + maven = new File( "apache-maven-3.2.5" ); - File mvnTemp = new File( "mvn.zip" ); - mvnTemp.deleteOnExit(); + if ( !maven.exists() ) + { + System.out.println( "Maven does not exist, downloading. Please wait." ); + + File mvnTemp = new File( "mvn.zip" ); + mvnTemp.deleteOnExit(); - download( "http://static.spigotmc.org/maven/apache-maven-3.2.5-bin.zip", mvnTemp ); - unzip( mvnTemp, new File( "." ) ); + download( "http://static.spigotmc.org/maven/apache-maven-3.2.5-bin.zip", mvnTemp ); + unzip( mvnTemp, new File( "." ) ); + } } String mvn = maven.getAbsolutePath() + "/bin/mvn"; -- cgit v1.2.3