mirror of
https://github.com/xpipe-io/xpipe.git
synced 2024-10-01 17:47:30 +13:00
Fix beacon server start up failing
This commit is contained in:
parent
402c6850a0
commit
32e9772154
4 changed files with 17 additions and 7 deletions
|
@ -131,7 +131,7 @@ public final class XPipeApiConnection extends BeaconConnection {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void start() throws Exception {
|
private void start() throws Exception {
|
||||||
var installation = XPipeInstallation.getDefaultInstallationBasePath();
|
var installation = XPipeInstallation.getLocalDefaultInstallationBasePath();
|
||||||
BeaconServer.start(installation);
|
BeaconServer.start(installation);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ public class BeaconDaemonController {
|
||||||
if ((process = BeaconServer.tryStartCustom()) != null) {
|
if ((process = BeaconServer.tryStartCustom()) != null) {
|
||||||
custom = true;
|
custom = true;
|
||||||
} else {
|
} else {
|
||||||
var defaultBase = XPipeInstallation.getDefaultInstallationBasePath();
|
var defaultBase = XPipeInstallation.getLocalDefaultInstallationBasePath();
|
||||||
process = BeaconServer.start(defaultBase);
|
process = BeaconServer.start(defaultBase);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
package io.xpipe.core.util;
|
package io.xpipe.core.util;
|
||||||
|
|
||||||
import io.xpipe.core.impl.FileNames;
|
import io.xpipe.core.impl.FileNames;
|
||||||
import io.xpipe.core.impl.LocalStore;
|
|
||||||
import io.xpipe.core.process.CommandProcessControl;
|
import io.xpipe.core.process.CommandProcessControl;
|
||||||
import io.xpipe.core.process.OsType;
|
import io.xpipe.core.process.OsType;
|
||||||
import io.xpipe.core.process.ProcessOutputException;
|
import io.xpipe.core.process.ProcessOutputException;
|
||||||
|
@ -65,10 +64,21 @@ public class XPipeInstallation {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getDefaultInstallationBasePath() throws Exception {
|
public static String getLocalDefaultInstallationBasePath() {
|
||||||
try (ShellProcessControl pc = new LocalStore().create().start()) {
|
var customHome = System.getenv("XPIPE_HOME");
|
||||||
return getDefaultInstallationBasePath(pc, true);
|
if (!customHome.isEmpty()) {
|
||||||
|
return customHome;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
String path = null;
|
||||||
|
if (OsType.getLocal().equals(OsType.WINDOWS)) {
|
||||||
|
var base = System.getenv("LOCALAPPDATA");
|
||||||
|
path = FileNames.join(base, "X-Pipe");
|
||||||
|
} else {
|
||||||
|
path = "/opt/xpipe";
|
||||||
|
}
|
||||||
|
|
||||||
|
return path;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getDefaultInstallationBasePath(ShellProcessControl p, boolean acceptPortable) throws Exception {
|
public static String getDefaultInstallationBasePath(ShellProcessControl p, boolean acceptPortable) throws Exception {
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
0.0.2.3
|
0.0.2.4-SNAPSHOT
|
Loading…
Reference in a new issue