From 73cf0e994f963791c3e277265b7932d2d8340a18 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Mon, 23 Feb 2015 09:32:50 +0000 Subject: Use JOpt for flags --- src/main/java/org/spigotmc/builder/Builder.java | 46 +++++++++++-------------- 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/src/main/java/org/spigotmc/builder/Builder.java b/src/main/java/org/spigotmc/builder/Builder.java index b7b0234..4bcec9c 100644 --- a/src/main/java/org/spigotmc/builder/Builder.java +++ b/src/main/java/org/spigotmc/builder/Builder.java @@ -45,6 +45,10 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSession; import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; + +import joptsimple.OptionParser; +import joptsimple.OptionSet; +import joptsimple.OptionSpec; import lombok.RequiredArgsConstructor; import org.apache.commons.io.FileUtils; import org.apache.commons.io.output.TeeOutputStream; @@ -68,33 +72,25 @@ public class Builder public static void main(String[] args) throws Exception { - for ( String s : args ) + OptionParser parser = new OptionParser(); + OptionSpec disableCertFlag = parser.accepts( "disable-certificate-check" ); + OptionSpec dontUpdateFlag = parser.accepts( "dont-update" ); + OptionSpec skipCompileFlag = parser.accepts( "skip-compile" ); + OptionSpec generateSourceFlag = parser.accepts( "generate-source" ); + OptionSpec generateDocsFlag = parser.accepts( "generate-docs" ); + OptionSpec devFlag = parser.accepts( "dev" ); + + OptionSet options = parser.parse( args ); + + if ( options.has( disableCertFlag ) ) { - if ( "--disable-certificate-check".equals( s ) ) - { - disableHttpsCertificateCheck(); - } - if ( "--dont-update".equals( s ) ) - { - dontUpdate = true; - } - if ( "--skip-compile".endsWith( s ) ) - { - skipCompile = true; - } - if ( "--generate-source".equals( s ) ) - { - generateSource = true; - } - if ( "--generate-docs".equals( s ) ) - { - generateDocs = true; - } - if ( "--dev".equals( s ) ) - { - dev = true; - } + disableHttpsCertificateCheck(); } + dontUpdate = options.has( dontUpdateFlag ); + skipCompile = options.has( skipCompileFlag ); + generateSource = options.has( generateSourceFlag ); + generateDocs = options.has( generateDocsFlag ); + dev = options.has( devFlag ); logOutput(); -- cgit v1.2.3