Pass command line arguments to zap.sh to the JVM, not to the ZAP jar.

This seems related to zaproxy#29, where command line options for setting the JVM's SOCKS proxy configuration are being ignored.
fabacab · Sep 18, 2015 · ce85306 · ce85306
1 parent 4d85b66
commit ce85306
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/zap.sh b/src/zap.sh
@@ -110,7 +110,7 @@ if [ "$OS" = "Darwin" ]; then
   done
 
   # It's likely that -Xdock:icon would be ignored on other platforms, but this is known to work
-  exec java ${JMEM} -Xdock:icon="../Resources/ZAP.icns" -jar "${BASEDIR}/zap-dev.jar" "${ZAP_ARGS[@]}"
+  exec java ${JMEM} -Xdock:icon="../Resources/ZAP.icns" "${ZAP_ARGS[@]}" -jar "${BASEDIR}/zap-dev.jar"
 else
-  exec java ${JMEM} -jar "${BASEDIR}/zap-dev.jar" "$@"
+  exec java ${JMEM} "$@" -jar "${BASEDIR}/zap-dev.jar"
 fi