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

Commit 9215272

Browse files
committed
refactore whitespace lines
1 parent 3633aa8 commit 9215272

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

src/universalJavaApplicationStub

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ if [ $exitcode -eq 0 ]; then
140140

141141
# read the Java WorkingDirectory
142142
JVMWorkDir=`/usr/libexec/PlistBuddy -c "print ${JavaKey}:WorkingDirectory" "${InfoPlistFile}" 2> /dev/null | xargs`
143-
143+
144144
# set Working Directory based upon Plist info
145145
if [[ ! -z ${JVMWorkDir} ]]; then
146146
WorkingDirectory="${JVMWorkDir}"
@@ -212,15 +212,15 @@ else
212212
# replace occurences of $APP_ROOT with its content
213213
JVMOptions=`eval "echo ${JVMOptions}"`
214214

215-
# read the ClassPath in either Array or String style
216-
JVMClassPath_RAW=`/usr/libexec/PlistBuddy -c "print JVMClassPath" "${InfoPlistFile}" 2> /dev/null`
217-
if [[ $JVMClassPath_RAW == *Array* ]] ; then
218-
JVMClassPath=.`/usr/libexec/PlistBuddy -c "print JVMClassPath" "${InfoPlistFile}" 2> /dev/null | grep " " | sed 's/^ */:/g' | tr -d '\n' | xargs`
219-
elif [[ ! -z ${JVMClassPath_RAW} ]] ; then
220-
JVMClassPath=${JVMClassPath_RAW}
221-
else
222-
#default: fallback to OracleJavaFolder
223-
JVMClassPath="${JavaFolder}/*"
215+
# read the ClassPath in either Array or String style
216+
JVMClassPath_RAW=`/usr/libexec/PlistBuddy -c "print JVMClassPath" "${InfoPlistFile}" 2> /dev/null`
217+
if [[ $JVMClassPath_RAW == *Array* ]] ; then
218+
JVMClassPath=.`/usr/libexec/PlistBuddy -c "print JVMClassPath" "${InfoPlistFile}" 2> /dev/null | grep " " | sed 's/^ */:/g' | tr -d '\n' | xargs`
219+
elif [[ ! -z ${JVMClassPath_RAW} ]] ; then
220+
JVMClassPath=${JVMClassPath_RAW}
221+
else
222+
#default: fallback to OracleJavaFolder
223+
JVMClassPath="${JavaFolder}/*"
224224
fi
225225
# expand variables $APP_PACKAGE, $JAVAROOT, $USER_HOME
226226
JVMClassPath=`eval "echo ${JVMClassPath}"`
@@ -265,7 +265,7 @@ fi
265265
function JavaVersionSatisfiesRequirement() {
266266
java_ver=$1
267267
java_req=$2
268-
268+
269269
# e.g. 1.8*
270270
if [[ ${java_req} =~ ^[0-9]\.[0-9]\*$ ]] ; then
271271
java_req_num=${java_req:0:3}
@@ -275,7 +275,7 @@ function JavaVersionSatisfiesRequirement() {
275275
else
276276
return 1
277277
fi
278-
278+
279279
# e.g. 1.8+
280280
elif [[ ${java_req} =~ ^[0-9]\.[0-9]\+$ ]] ; then
281281
java_req_num=`echo ${java_req} | sed -E 's/[[:punct:]]//g'`
@@ -285,15 +285,15 @@ function JavaVersionSatisfiesRequirement() {
285285
else
286286
return 1
287287
fi
288-
288+
289289
# e.g. 1.8
290290
elif [[ ${java_req} =~ ^[0-9]\.[0-9]$ ]] ; then
291291
if [ ${java_ver} == ${java_req} ] ; then
292292
return 0
293293
else
294294
return 1
295295
fi
296-
296+
297297
# not matching any of the above patterns
298298
else
299299
return 2
@@ -324,7 +324,7 @@ oracle_jre_version=`extractJavaMajorVersion "${oracle_jre_plugin}"`
324324
# first check system variable "$JAVA_HOME"
325325
if [ -n "$JAVA_HOME" ] ; then
326326
JAVACMD="$JAVA_HOME/bin/java"
327-
327+
328328
# check for JVMversion requirements
329329
elif [ ! -z ${JVMVersion} ] ; then
330330

0 commit comments

Comments
 (0)