Skip to content
This repository was archived by the owner on Feb 4, 2023. It is now read-only.

Commit 0615751

Browse files
committed
fix formatting of de2de6c
and add a note for fallback
1 parent de2de6c commit 0615751

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

src/universalJavaApplicationStub

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,17 +218,18 @@ else
218218
JVMClassPath_RAW=`/usr/libexec/PlistBuddy -c "print JVMClassPath" "${InfoPlistFile}" 2> /dev/null`
219219
if [[ $JVMClassPath_RAW == *Array* ]] ; then
220220
JVMClassPath=.`/usr/libexec/PlistBuddy -c "print JVMClassPath" "${InfoPlistFile}" 2> /dev/null | grep " " | sed 's/^ */:/g' | tr -d '\n' | xargs`
221+
# expand variables $APP_PACKAGE, $JAVAROOT, $USER_HOME
222+
JVMClassPath=`eval "echo ${JVMClassPath}"`
221223

222-
# expand variables $APP_PACKAGE, $JAVAROOT, $USER_HOME
223-
JVMClassPath=`eval "echo ${JVMClassPath}"`
224224
elif [[ ! -z ${JVMClassPath_RAW} ]] ; then
225225
JVMClassPath=${JVMClassPath_RAW}
226+
# expand variables $APP_PACKAGE, $JAVAROOT, $USER_HOME
227+
JVMClassPath=`eval "echo ${JVMClassPath}"`
226228

227-
# expand variables $APP_PACKAGE, $JAVAROOT, $USER_HOME
228-
JVMClassPath=`eval "echo ${JVMClassPath}"`
229229
else
230230
#default: fallback to OracleJavaFolder
231231
JVMClassPath="${JavaFolder}/*"
232+
# Do NOT expand the default App.app/Contents/Java/* classpath (#42)
232233
fi
233234

234235
# read the JVM Default Options

0 commit comments

Comments
 (0)