Merge pull request #14 from SagePtr/patch-1

Fixed an exception when using CLI's --patch arg without any mods
This commit is contained in:
Vhati 2018-03-06 21:45:07 -05:00 committed by GitHub
commit 4bb3a3ddb9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -233,22 +233,24 @@ public class SlipstreamCLI {
log.info( "Patching..." ); log.info( "Patching..." );
List<File> modFiles = new ArrayList<File>(); List<File> modFiles = new ArrayList<File>();
for ( String modFileName : slipstreamCmd.modFileNames ) { if ( slipstreamCmd.modFileNames != null ) {
File modFile = new File( modsDir, modFileName ); for ( String modFileName : slipstreamCmd.modFileNames ) {
File modFile = new File( modsDir, modFileName );
if ( modFile.isDirectory() ) { if ( modFile.isDirectory() ) {
log.info( String.format( "Zipping dir: %s/", modFile.getName() ) ); log.info( String.format( "Zipping dir: %s/", modFile.getName() ) );
try { try {
modFile = createTempMod( modFile ); modFile = createTempMod( modFile );
deleteHook.addDoomedFile( modFile ); deleteHook.addDoomedFile( modFile );
} }
catch ( IOException e ) { catch ( IOException e ) {
log.error( String.format( "Error zipping dir: %s/", modFile.getName() ), e ); log.error( String.format( "Error zipping dir: %s/", modFile.getName() ), e );
System.exit( 1 ); System.exit( 1 );
}
} }
modFiles.add( modFile );
} }
modFiles.add( modFile );
} }
boolean globalPanic = slipstreamCmd.globalPanic; boolean globalPanic = slipstreamCmd.globalPanic;