summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pom.xml2
-rw-r--r--src/main/java/org/spigotmc/builder/Builder.java10
2 files changed, 10 insertions, 2 deletions
diff --git a/pom.xml b/pom.xml
index 191ee11..413dda4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
- <version>1.16.16</version>
+ <version>1.18.4</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/spigotmc/builder/Builder.java b/src/main/java/org/spigotmc/builder/Builder.java
index cfd0255..8181bff 100644
--- a/src/main/java/org/spigotmc/builder/Builder.java
+++ b/src/main/java/org/spigotmc/builder/Builder.java
@@ -374,7 +374,7 @@ public class Builder
File finalMappedJar = new File( workDir, "mapped." + mappingsVersion + ".jar" );
if ( !finalMappedJar.exists() )
{
- System.out.println( "Final mapped jar: " + finalMappedJar + " does not exist, creating!" );
+ System.out.println( "Final mapped jar: " + finalMappedJar + " does not exist, creating (please wait)!" );
File clMappedJar = new File( finalMappedJar + "-cl" );
File mMappedJar = new File( finalMappedJar + "-m" );
@@ -632,6 +632,14 @@ public class Builder
private static int runProcess0(File workDir, String... command) throws Exception
{
+ Preconditions.checkArgument( workDir != null, "workDir" );
+ Preconditions.checkArgument( command != null && command.length > 0, "Invalid command" );
+
+ if ( command[0].equals( "java" ) )
+ {
+ command[0] = System.getProperty( "java.home" ) + "/bin/" + command[0];
+ }
+
ProcessBuilder pb = new ProcessBuilder( command );
pb.directory( workDir );
pb.environment().put( "JAVA_HOME", System.getProperty( "java.home" ) );