CodeMirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-06-30 20:10:57 +12:00
Code Issues Packages Projects Releases Wiki Activity

More installation fixes

Browse source
This commit is contained in:
Christopher Schnick 2022-12-28 03:57:56 +01:00
parent a658b0391a
commit e130d1ab20
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/src/main/java/io/xpipe/core/util/XPipeInstallation.java
View file

@ -28,7 +28,12 @@ public class XPipeInstallation {
}
public static Path getLocalInstallationBasePath(){
Path path = Path.of(System.getProperty("java.home"));
Path path = Path.of(ProcessHandle.current().info().command().orElseThrow());
var name = path.getFileName().toString();
if (name.endsWith("java") || name.endsWith("java.exe")) {
return Path.of(System.getProperty("user.dir"));
}
return getLocalInstallationBasePathForExecutable(path);
}
@ -43,7 +48,14 @@ public class XPipeInstallation {
}
}
public static Path getLocalInstallationBasePathForExecutable(Path executable) {
public static Path getLocalExtensionsDirectory() {
Path path = getLocalInstallationBasePath();
return OsType.getLocal().equals(OsType.MAC)
? path.resolve("Contents").resolve("extensions")
: path.resolve("extensions");
}
private static Path getLocalInstallationBasePathForExecutable(Path executable) {
if (OsType.getLocal().equals(OsType.MAC)) {
return executable.getParent().getParent().getParent();
} else if (OsType.getLocal().equals(OsType.LINUX)) {