Fixed command line parameter check. Adjusted example configs.

runelite · Nov 19, 2015 · 7d5996f · 7d5996f
1 parent 2c50961
commit 7d5996f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/example-config-linux.json b/example-config-linux.json
@@ -2,8 +2,8 @@
     "platform": "linux64",
     "jdk": "/home/badlogic/Downloads/openjdk-1.7.0-u45-unofficial-icedtea-2.4.3-linux-amd64-image.zip",
     "executable": "myapp",
-    "appjar": "target/packr-1.1-SNAPSHOT.jar",
-    "mainclass": "com/badlogicgames/packr/TestApp",
+    "classpath": "target/packr-2.0-SNAPSHOT.jar",
+    "mainclass": "com.badlogicgames.packr.TestApp",
     "vmargs": [
     	"-Xmx1G"
     ],

diff --git a/example-config-mac.json b/example-config-mac.json
@@ -2,8 +2,8 @@
     "platform": "mac",
     "jdk": "/Users/badlogic/Downloads/openjdk-1.7.0-u45-unofficial-icedtea-2.4.3-macosx-x86_64-image.zip",
     "executable": "myapp",
-    "appjar": "target/packr-1.2-SNAPSHOT.jar",
-    "mainclass": "com/badlogicgames/packr/TestApp",
+    "classpath": "target/packr-1.2-SNAPSHOT.jar",
+    "mainclass": "com.badlogicgames.packr.TestApp",
     "vmargs": [
     	"-Xmx1G"
     ],
@@ -13,4 +13,4 @@
     ],
     "minimizejre": "soft",
     "outdir": "out-mac"
-}
+}
diff --git a/example-config-windows.json b/example-config-windows.json
@@ -2,8 +2,8 @@
     "platform": "windows",
     "jdk": "C:/Users/badlogic/Downloads/openjdk-1.7.0-u45-unofficial-icedtea-2.4.3-windows-i586-image.zip",
     "executable": "myapp",
-    "appjar": "target/packr-1.0-SNAPSHOT.jar",
-    "mainclass": "com/badlogicgames/packr/TestApp",
+    "classpath": "target/packr-1.0-SNAPSHOT.jar",
+    "mainclass": "com.badlogicgames.packr.TestApp",
     "vmargs": [
     	"-Xmx1G"
     ],
@@ -13,4 +13,4 @@
     ],
     "minimizejre": "soft",
     "outdir": "out-win"
-}
+}
diff --git a/src/main/java/com/badlogicgames/packr/Packr.java b/src/main/java/com/badlogicgames/packr/Packr.java
@@ -433,7 +433,7 @@ private static Map<String, String> parseArgs (String[] args) {
 		if(params.get("platform") == null) error();
 		if(params.get("jdk") == null) error();
 		if(params.get("executable") == null) error();
-		if(params.get("appjar") == null) error();
+		if(params.get("classpath") == null) error();
 		if(params.get("mainclass") == null) error();
 		if(params.get("outdir") == null) error();