diff options
| author | md_5 <git@md-5.net> | 2017-01-30 08:35:51 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2017-01-30 08:35:51 +1100 |
| commit | 60cf7613510b319bb80dbd317ba4a7c8da7b1c49 (patch) | |
| tree | b359b725c2970030e0b20b5e9d3968c463746187 | |
| parent | 4bf25ea519ecb912e5320674420f071302d18f05 (diff) | |
| download | buildtools-60cf7613510b319bb80dbd317ba4a7c8da7b1c49.tar buildtools-60cf7613510b319bb80dbd317ba4a7c8da7b1c49.tar.gz buildtools-60cf7613510b319bb80dbd317ba4a7c8da7b1c49.tar.lz buildtools-60cf7613510b319bb80dbd317ba4a7c8da7b1c49.tar.xz buildtools-60cf7613510b319bb80dbd317ba4a7c8da7b1c49.zip | |
BUILDTOOLS-301: Use sh for all scripts.
| -rw-r--r-- | src/main/java/org/spigotmc/builder/Builder.java | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/main/java/org/spigotmc/builder/Builder.java b/src/main/java/org/spigotmc/builder/Builder.java index c7e4c39..1ff6d78 100644 --- a/src/main/java/org/spigotmc/builder/Builder.java +++ b/src/main/java/org/spigotmc/builder/Builder.java @@ -143,18 +143,13 @@ public class Builder System.err.println( "*** WARNING *** Use java -version to check your version and update as soon as possible." ); } - String shell = System.getenv().get( "SHELL" ); - if ( shell == null || shell.trim().isEmpty() ) + try { - shell = "bash"; - try - { - runProcess( CWD, shell, "-c", "exit" ); - } catch ( Exception ex ) - { - System.out.println( "You must run this jar through bash (msysgit)" ); - System.exit( 1 ); - } + runProcess( CWD, "sh", "-c", "exit" ); + } catch ( Exception ex ) + { + System.out.println( "You must run this jar through bash (msysgit)" ); + System.exit( 1 ); } try @@ -431,7 +426,7 @@ public class Builder try { - runProcess( spigot, shell, "applyPatches.sh" ); + runProcess( spigot, "sh", "applyPatches.sh" ); System.out.println( "*** Spigot patches applied!" ); if ( !skipCompile ) |