Skip to content

Commit be0f950

Browse files
committed
[issue #2964] Try to look in chocolatey's default installation dir.
1 parent a7b6256 commit be0f950

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/installer/lombok/installer/eclipse/StandardProductDescriptor.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,14 @@ private static String concat(String base, String pathSeparator, String alternati
157157
return base + pathSeparator + alternative.replaceAll("[\\/]", "\\" + pathSeparator);
158158
}
159159

160+
private static final String[] BASE_WINDOWS_ROOTS = {"\\", "\\Program Files", "\\Program Files (x86)", "\\ProgramData\\Chocolatey\\lib"};
160161
private static String[] windowsRoots() {
161162
String localAppData = windowsLocalAppData();
162-
if (localAppData == null) return new String[] {"\\", "\\Program Files", "\\Program Files (x86)", USER_HOME};
163-
return new String[] {"\\", "\\Program Files", "\\Program Files (x86)", USER_HOME, localAppData};
163+
String[] out = new String[BASE_WINDOWS_ROOTS.length + (localAppData == null ? 1 : 2)];
164+
System.arraycopy(BASE_WINDOWS_ROOTS, 0, out, 0, BASE_WINDOWS_ROOTS.length);
165+
out[BASE_WINDOWS_ROOTS.length] = USER_HOME;
166+
if (localAppData != null) out[BASE_WINDOWS_ROOTS.length + 1] = localAppData;
167+
return out;
164168
}
165169

166170
private static String windowsLocalAppData() {

0 commit comments

Comments
 (0)