diff options
Diffstat (limited to 'bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/ParserUtils.java')
| -rw-r--r-- | bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/ParserUtils.java | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/ParserUtils.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/ParserUtils.java index 4080ffcb6..12ba81aac 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/ParserUtils.java +++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/ParserUtils.java @@ -48,19 +48,16 @@ public class ParserUtils { File launcherFile = launcherData.getLauncher(); if (launcherFile != null) { - if (Constants.OS_MACOSX.equals(launcherData.getOS())) { - //the equinox launcher will look 3 levels up on the mac when going from executable to launcher.jar + if (Constants.OS_MACOSX.equals(launcherData.getOS())) { // + //TODO We are going to change this - the equinox launcher will look 3 levels up on the mac when going from executable to launcher.jar //see org.eclipse.equinox.executable/library/eclipse.c : findStartupJar(); IPath launcherPath = new Path(launcherFile.getAbsolutePath()); - if (launcherPath.segmentCount() > 4) { - //removing "Eclipse.app/Contents/MacOS/eclipse" - launcherPath = launcherPath.removeLastSegments(4); + if (launcherPath.segmentCount() > 2) { + //removing "MacOS/eclipse" from the end of the path + launcherPath = launcherPath.removeLastSegments(2).append("Eclipse"); //$NON-NLS-1$ return launcherPath.toFile(); } } - if (EclipseLauncherParser.MACOSX_BUNDLED.equals(launcherData.getOS())) { - Log.log(LogService.LOG_WARNING, "Problem figuring out the osgi install area. The bundled mode of macosx requires a -startup argument to be specified."); //$NON-NLS-1$ - } return launcherFile.getParentFile(); } return null; |