beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-22 07:30:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix installation pass for mac

Browse source
This commit is contained in:
Christopher Schnick 2022-12-27 14:56:51 +01:00
parent 72b96e8b80
commit 38021704ff
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -14,6 +14,8 @@ public class XPipeInstallation {
var suffix = (arguments != null ? " " + arguments : "");
if (OsType.getLocal().equals(OsType.LINUX)) {
return "nohup \"" + installationBase + "/app/bin/xpiped\" --external" + suffix + " & disown";
} else if (OsType.getLocal().equals(OsType.MAC)) {
return "nohup \"" + installationBase + "/Contents/MacOS/xpiped\" --external" + suffix + " & disown";
}
return "\"" + FileNames.join(installationBase, XPipeInstallation.getDaemonExecutablePath(OsType.getLocal())) + "\" --external" + suffix;
@ -38,7 +40,11 @@ public class XPipeInstallation {
return defaultInstallation;
}
return FileNames.getParent(FileNames.getParent(cliExecutable));
if (p.getOsType().equals(OsType.MAC)) {
return FileNames.getParent(FileNames.getParent(FileNames.getParent(FileNames.getParent(cliExecutable))));
} else {
return FileNames.getParent(FileNames.getParent(cliExecutable));
}
}
public static String queryInstallationVersion(ShellProcessControl p, String exec) throws Exception {