aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRoel Spilker <r.spilker@gmail.com>2017-12-11 22:43:16 +0100
committerRoel Spilker <r.spilker@gmail.com>2017-12-11 22:43:16 +0100
commit50cb79b9ed02a1e87bd223a36c512a6857294094 (patch)
tree37ff4f521c5d41efb8829de976ba783b0a55a6a4 /src
parentaaa29d16ee2efa83cc1ae2ff7313bd2dc093f2e7 (diff)
downloadlombok-50cb79b9ed02a1e87bd223a36c512a6857294094.tar.gz
lombok-50cb79b9ed02a1e87bd223a36c512a6857294094.tar.bz2
lombok-50cb79b9ed02a1e87bd223a36c512a6857294094.zip
installer now defaults to inserting an absolute path into eclipse.ini
Diffstat (limited to 'src')
-rw-r--r--src/installer/lombok/installer/eclipse/EclipseProductLocation.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/installer/lombok/installer/eclipse/EclipseProductLocation.java b/src/installer/lombok/installer/eclipse/EclipseProductLocation.java
index 886e3e85..aa97a3e5 100644
--- a/src/installer/lombok/installer/eclipse/EclipseProductLocation.java
+++ b/src/installer/lombok/installer/eclipse/EclipseProductLocation.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009-2016 The Project Lombok Authors.
+ * Copyright (C) 2009-2017 The Project Lombok Authors.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -256,11 +256,11 @@ public final class EclipseProductLocation extends IdeLocation {
*/
@Override
public String install() throws InstallException {
- // For whatever reason, relative paths in your eclipse.ini file don't work on linux, but only for -javaagent.
- // If someone knows how to fix this, please do so, as this current hack solution (putting the absolute path
- // to the jar files in your eclipse.ini) means you can't move your eclipse around on linux without lombok
- // breaking it. NB: rerunning lombok.jar installer and hitting 'update' will fix it if you do that.
- boolean fullPathRequired = OsUtils.getOS() == OsUtils.OS.UNIX || System.getProperty("lombok.installer.fullpath") != null;
+ // On Linux, for whatever reason, relative paths in your eclipse.ini file don't work, but only for -javaagent.
+ // On Windows, since the Oomph, the generated shortcut starts in the wrong directory.
+ // So the default is to use absolute paths, breaking lombok when you move the eclipse directory.
+ // Or not break when you copy your directory, but break later when you remove the original one.
+ boolean fullPathRequired = !"false".equals(System.getProperty("lombok.installer.fullpath", "true"));
boolean installSucceeded = false;
StringBuilder newContents = new StringBuilder();