CodeMirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-09-28 23:31:43 +12:00
Code Issues Projects Releases Packages Wiki Activity

Don't fail when we can't resolve our own executable

Browse source
This commit is contained in:
crschnick 2023-12-22 23:32:18 +00:00
parent c790870ae6
commit 741edbec0d
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,6 +5,7 @@ import io.xpipe.core.store.FileNames;
import lombok.Getter;
import lombok.SneakyThrows;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.InvalidPathException;
@ -77,10 +78,10 @@ public class XPipeInstallation {
public static Path getCurrentInstallationBasePath() {
// We should always have a command associated with the current process, otherwise something went seriously wrong
// Resolve any possible links to a real path
Path path = Path.of(ProcessHandle.current().info().command().orElseThrow()).toRealPath();
Path path = toRealPathIfPossible(Path.of(ProcessHandle.current().info().command().orElseThrow()));
// Check if the process was started using a relative path, and adapt it if necessary
if (!path.isAbsolute()) {
path = Path.of(System.getProperty("user.dir")).resolve(path).toRealPath();
path = toRealPathIfPossible(Path.of(System.getProperty("user.dir")).resolve(path));
}
var name = path.getFileName().toString();
@ -97,6 +98,16 @@ public class XPipeInstallation {
}
}
private static Path toRealPathIfPossible(Path p) {
try {
// Under certain conditions, e.g. when running on a ramdisk, path resolution might fail.
// This is however not a big problem in that case, so we ignore it
return p.toRealPath();
} catch (IOException e) {
return p;
}
}
public static boolean isInstallationDistribution() {
var base = getCurrentInstallationBasePath();
if (OsType.getLocal().equals(OsType.MACOS)) {