Commits
Fabian Faßbender authored 6f7e115a007 Merge
| 46 46 | private static final File jacobeDir = new File( "jacobe" ); |
| 47 47 | |
| 48 48 | private static String username = null; |
| 49 49 | |
| 50 50 | public static void main(String[] args) throws Exception |
| 51 51 | { |
| 52 52 | if ( IS_MAC ) |
| 53 53 | { |
| 54 54 | System.out.println( "Sorry, but Macintosh is not currently a supported platform for compilation at this time." ); |
| 55 55 | System.out.println( "Please run this script on a Windows or Linux PC and then copy the jars to this computer." ); |
| 56 - | return; |
| 56 + | System.exit( 1 ); |
| 57 57 | } |
| 58 58 | |
| 59 59 | try |
| 60 60 | { |
| 61 61 | runProcess( "bash -c exit", CWD ); |
| 62 62 | } catch ( Exception ex ) |
| 63 63 | { |
| 64 64 | System.out.println( "You must run this jar through bash (msysgit)" ); |
| 65 - | return; |
| 65 + | System.exit( 1 ); |
| 66 66 | } |
| 67 67 | |
| 68 68 | try |
| 69 69 | { |
| 70 70 | runProcess( "git config --global user.name", CWD ); |
| 71 71 | } catch ( Exception ex ) |
| 72 72 | { |
| 73 73 | System.out.println( "Git name not set, setting it to default value." ); |
| 74 74 | runProcess( "git config --global user.name BuildTools", CWD ); |
| 75 75 | } |
| 289 289 | try |
| 290 290 | { |
| 291 291 | runProcess( "bash applyPatches.sh", spigot ); |
| 292 292 | System.out.println( "*** Spigot patches applied!" ); |
| 293 293 | System.out.println( "Compiling Spigot & Spigot-API" ); |
| 294 294 | runProcess( mvnCmd + " clean install", spigot ); |
| 295 295 | } catch ( Exception ex ) |
| 296 296 | { |
| 297 297 | System.err.println( "Error compiling Spigot, are you running this jar via msysgit?" ); |
| 298 298 | ex.printStackTrace(); |
| 299 + | System.exit( 1 ); |
| 299 300 | } |
| 300 301 | } |
| 301 302 | |
| 302 303 | private static void walkAndDos2Unix(File folder) |
| 303 304 | { |
| 304 305 | File[] files = folder.listFiles(); |
| 305 306 | if ( files == null ) return; |
| 306 307 | |
| 307 308 | for ( File file : files ) { |
| 308 309 | if ( file.getAbsolutePath().endsWith(".java") ) |