mirror of
https://github.com/xpipe-io/xpipe.git
synced 2024-09-15 16:59:00 +12:00
Fix installation pass for mac
This commit is contained in:
parent
f8a402a75b
commit
699549eeaa
1 changed files with 7 additions and 1 deletions
|
@ -14,6 +14,8 @@ public class XPipeInstallation {
|
||||||
var suffix = (arguments != null ? " " + arguments : "");
|
var suffix = (arguments != null ? " " + arguments : "");
|
||||||
if (OsType.getLocal().equals(OsType.LINUX)) {
|
if (OsType.getLocal().equals(OsType.LINUX)) {
|
||||||
return "nohup \"" + installationBase + "/app/bin/xpiped\" --external" + suffix + " & disown";
|
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;
|
return "\"" + FileNames.join(installationBase, XPipeInstallation.getDaemonExecutablePath(OsType.getLocal())) + "\" --external" + suffix;
|
||||||
|
@ -38,8 +40,12 @@ public class XPipeInstallation {
|
||||||
return defaultInstallation;
|
return defaultInstallation;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (p.getOsType().equals(OsType.MAC)) {
|
||||||
|
return FileNames.getParent(FileNames.getParent(FileNames.getParent(FileNames.getParent(cliExecutable))));
|
||||||
|
} else {
|
||||||
return FileNames.getParent(FileNames.getParent(cliExecutable));
|
return FileNames.getParent(FileNames.getParent(cliExecutable));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static String queryInstallationVersion(ShellProcessControl p, String exec) throws Exception {
|
public static String queryInstallationVersion(ShellProcessControl p, String exec) throws Exception {
|
||||||
try (CommandProcessControl c = p.command(List.of(exec, "version")).start()) {
|
try (CommandProcessControl c = p.command(List.of(exec, "version")).start()) {
|
||||||
|
|
Loading…
Reference in a new issue