diff options
| author | LukBukkit <luk.bukkit@gmail.com> | 2016-08-06 18:06:00 +0200 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-09-17 17:40:29 +1000 |
| commit | 0880f1d6f6c92c625be4f5d3d86f80fd3b425b96 (patch) | |
| tree | 6377d04f014c3fc7253c374e9fb79e63f396e648 | |
| parent | 00ec8a12f81eea2bdff05cb7502769880548167f (diff) | |
| download | buildtools-0880f1d6f6c92c625be4f5d3d86f80fd3b425b96.tar buildtools-0880f1d6f6c92c625be4f5d3d86f80fd3b425b96.tar.gz buildtools-0880f1d6f6c92c625be4f5d3d86f80fd3b425b96.tar.lz buildtools-0880f1d6f6c92c625be4f5d3d86f80fd3b425b96.tar.xz buildtools-0880f1d6f6c92c625be4f5d3d86f80fd3b425b96.zip | |
Fixed issues relating to the Windows 10 Ubuntu bash
| -rw-r--r-- | src/main/java/org/spigotmc/builder/Builder.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/main/java/org/spigotmc/builder/Builder.java b/src/main/java/org/spigotmc/builder/Builder.java index d747693..53b6b00 100644 --- a/src/main/java/org/spigotmc/builder/Builder.java +++ b/src/main/java/org/spigotmc/builder/Builder.java @@ -143,10 +143,8 @@ public class Builder System.err.println( "*** WARNING *** Use java -version to check your version and update as soon as possible." ); } - try - { - runProcess( CWD, "bash", "-c", "exit" ); - } catch ( Exception ex ) + String shell = System.getenv().get( "SHELL" ); + if ( shell == null || shell.trim().isEmpty() ) { System.out.println( "You must run this jar through bash (msysgit)" ); System.exit( 1 ); @@ -426,7 +424,7 @@ public class Builder try { - runProcess( spigot, "bash", "applyPatches.sh" ); + runProcess( spigot, shell, "applyPatches.sh" ); System.out.println( "*** Spigot patches applied!" ); if ( !skipCompile ) |