CodeMirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-07-01 04:21:11 +12:00
Code Issues Packages Projects Releases Wiki Activity

Fix beacon server start up failing

Browse source
This commit is contained in:
Christopher Schnick 2022-12-19 19:55:51 +01:00
parent 402c6850a0
commit 32e9772154
4 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/src/main/java/io/xpipe/api/connector/XPipeApiConnection.java
View file

@ -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);
} }

2
beacon/src/main/java/io/xpipe/beacon/BeaconDaemonController.java
View file

@ -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);
} }

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

@ -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 {

2
misc/version
View file

@ -1 +1 @@
0.0.2.3 0.0.2.4-SNAPSHOT