Merge pull request #1 from dpolivaev/master

All options not enclosed in quotes but taken separately + Java folder should be used as working directory

Author: tofi86

src/universalJavaApplicationStub

@@ -1,5 +1,4 @@
 #!/bin/sh
-
 ##################################################################################
 #                                                                                #
 # universalJavaApplicationStub                                                   #
@@ -26,7 +25,7 @@
 # Copyright (c) 2014 Tobias Fischer                                              #
 #                                                                                #
 # Permission is hereby granted, free of charge, to any person obtaining a copy   #
-# of this software and associated documentation files (the "Software"), to deal  # 
+# of this software and associated documentation files (the "Software"), to deal  #
 # in the Software without restriction, including without limitation the rights   #
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell      #
 # copies of the Software, and to permit persons to whom the Software is          #
@@ -92,41 +91,43 @@ CFBundleIconFile=`/usr/libexec/PlistBuddy -c "print :CFBundleIconFile" ${InfoPli
 
 # read Info.plist in Apple style
 if [ -d "${AppleJavaFolder}" ]; then
-	
-	# set classpath
-	JVMClasspath="${AppleJavaFolder}*"
-	
+
+	# set working directory
+	JavaFolder="${AppleJavaFolder}"
+	ResourcesFolder=".."
+
 	# read the MainClass name
 	JVMMainClass=`/usr/libexec/PlistBuddy -c "print :Java:MainClass" ${InfoPlistFile} 2> /dev/null`
-	
+
 	# read the JVM Options
 	JVMOptions=`/usr/libexec/PlistBuddy -c "print :Java:Properties" ${InfoPlistFile} 2> /dev/null | grep " =" | sed 's/^ */-D/g' | tr '\n' ' ' | sed 's/  */ /g' | sed 's/ = /=/g' | xargs`
-	
+
 	# read the JVM Default Options
 	JVMDefaultOptions=`/usr/libexec/PlistBuddy -c "print :Java:VMOptions" ${InfoPlistFile} 2> /dev/null | xargs`
-	
+
 	# read the JVM Arguments
 	JVMArguments=`/usr/libexec/PlistBuddy -c "print :Java:Arguments" ${InfoPlistFile} 2> /dev/null | xargs`
 
 
 # read Info.plist in Oracle style
 elif [ -d "${OracleJavaFolder}" ]; then
-	
-	# set classpath
-	JVMClasspath="${OracleJavaFolder}*"
-	
+
+	# set working directory
+	JavaFolder="${OracleJavaFolder}"
+	ResourcesFolder="../Resources"
+
 	# read the MainClass name
 	JVMMainClass=`/usr/libexec/PlistBuddy -c "print :JVMMainClassName" ${InfoPlistFile} 2> /dev/null`
-	
+
 	# read the JVM Options
 	JVMOptions=`/usr/libexec/PlistBuddy -c "print :JVMOptions" ${InfoPlistFile} 2> /dev/null | grep " -" | tr '\n' ' ' | sed 's/  */ /g' | xargs`
-	
+
 	# read the JVM Default Options
 	JVMDefaultOptions=`/usr/libexec/PlistBuddy -c "print :JVMDefaultOptions" ${InfoPlistFile} 2> /dev/null | grep -o "\-.*" | tr '\n' ' ' | xargs`
-	
+
 	# read the JVM Arguments
 	JVMArguments=`/usr/libexec/PlistBuddy -c "print :JVMArguments" ${InfoPlistFile} 2> /dev/null | tr '\n' ' ' | sed -E 's/Array \{ *(.*) *\}/\1/g' | sed 's/  */ /g' | xargs`
-	
+
 fi
 
 
@@ -162,21 +163,23 @@ fi
 #
 # execute JAVA commandline and do some pre-checks
 ####################################################
-	
+
 # display error message if MainClassName is empty
 if [ ${JVMMainClass} == "" ]; then
 	# display error message with applescript
 	osascript -e "tell application \"System Events\" to display dialog \"ERROR launching ${CFBundleName}!\n\nNo MainClassName specified!\nJava application cannot be started!\" with title \"${CFBundleName}\" buttons {\" OK \"} default button 1 with icon path to resource \"${CFBundleIconFile}\" in bundle (path to me)"
 	# exit with error
 	exit 1
-	
-	
+
+
 # check whether $JAVACMD is executable
 elif [ -x "$JAVACMD" ]; then
 
 	# enable drag&drop to the dock icon
 	export CFProcessPath="$0"
-	
+
+	cd "$JavaFolder"
+
 	# execute Java and set
 	#	- classpath
 	#	- dock icon
@@ -186,23 +189,24 @@ elif [ -x "$JAVACMD" ]; then
 	#	- main class
 	#	- JVM arguments
 	exec "$JAVACMD" \
-			-cp "${JVMClasspath}" \
-			-Xdock:icon="$PROGDIR/../Resources/${CFBundleIconFile}" \
+			-cp "./*" \
+			-Xdock:icon="$ResourcesFolder/${CFBundleIconFile}" \
 			-Xdock:name="${CFBundleName}" \
-			${JVMOptions:+"$JVMOptions" }\
-			${JVMDefaultOptions:+"$JVMDefaultOptions" }\
+			${JVMOptions:+$JVMOptions }\
+			${JVMDefaultOptions:+$JVMDefaultOptions }\
 			"${JVMMainClass}"\
-			${JVMArguments:+"$JVMArguments"}
-	
-	
+			${JVMArguments:+$JVMArguments}
+
+
 else
 
 	# display error message with applescript
 	osascript -e "tell application \"System Events\" to display dialog \"ERROR launching ${CFBundleName}!\n\nYou need to have JAVA installed on your Mac!\nVisit http://java.com for more information...\" with title \"${CFBundleName}\" buttons {\" OK \"} default button 1 with icon path to resource \"${CFBundleIconFile}\" in bundle (path to me)"
-	
+
 	# and open java.com
 	open http://java.com
-	
+
 	# exit with error
 	exit 1
-fi
+fi
+