spigot-mirror/buildtools
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/buildtools.git synced 2025-09-18 21:45:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

BUILDTOOLS-301: Use sh for all scripts.

Browse source
This commit is contained in:
md_5 2017-01-30 08:35:51 +11:00
parent 4bf25ea519
commit 60cf761351
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/org/spigotmc/builder/Builder.java
View file

@ -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 )