diff options
| author | Reinier Zwitserloot <reinier@zwitserloot.com> | 2015-03-31 00:32:43 +0200 |
|---|---|---|
| committer | Reinier Zwitserloot <reinier@zwitserloot.com> | 2015-03-31 00:32:43 +0200 |
| commit | 7707140b6c86bd34801f3fd29092be06e2cee3cf (patch) | |
| tree | 4163863ea3453b64f3c68b0c9fdb168b65b41853 /src/installer/lombok/installer/eclipse/EclipseLocationProvider.java | |
| parent | d831aabf6cf04a793792fec712912e31d537d4c9 (diff) | |
| download | lombok-7707140b6c86bd34801f3fd29092be06e2cee3cf.tar.gz lombok-7707140b6c86bd34801f3fd29092be06e2cee3cf.tar.bz2 lombok-7707140b6c86bd34801f3fd29092be06e2cee3cf.zip | |
since Eclipse Mars and the Oomph installer, the structure of eclipse on macs looks different. Installer updated to account for this.
Diffstat (limited to 'src/installer/lombok/installer/eclipse/EclipseLocationProvider.java')
| -rw-r--r-- | src/installer/lombok/installer/eclipse/EclipseLocationProvider.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/installer/lombok/installer/eclipse/EclipseLocationProvider.java b/src/installer/lombok/installer/eclipse/EclipseLocationProvider.java index 914de588..29716a1f 100644 --- a/src/installer/lombok/installer/eclipse/EclipseLocationProvider.java +++ b/src/installer/lombok/installer/eclipse/EclipseLocationProvider.java @@ -104,11 +104,16 @@ public class EclipseLocationProvider implements IdeLocationProvider { if (ini.isFile()) return makeLocation(canonical(exePath), ini); } - /* Try looking for Eclipse/app/Contents/MacOS/eclipse.ini as sibling to executable; this works on Mac OS X. */ { + /* Try looking for Eclipse.app/Contents/MacOS/eclipse.ini as sibling to executable; this works on Mac OS X. */ { File ini = new File(exePath.getParentFile(), getMacAppName() + "/Contents/MacOS/" + getIniName()); if (ini.isFile()) return makeLocation(canonical(exePath), ini); } + /* Starting with Eclipse Mars (with the oomph installer), the structure has changed, and it's now at Eclipse.app/Contents/Eclipse/eclipse.ini*/ { + File ini = new File(exePath.getParentFile(), getMacAppName() + "/Contents/Eclipse/" + getIniName()); + if (ini.isFile()) return makeLocation(canonical(exePath), ini); + } + /* If executable is a soft link, follow it and retry. */ { if (loopCounter < 50) { try { |