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

Fix bug in beacon server launch (again)

Browse source
This commit is contained in:
Christopher Schnick 2022-12-16 21:45:07 +01:00
parent e0d9b7cff2
commit ec10f3dcab
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
beacon/src/main/java/io/xpipe/beacon/BeaconServer.java
View file

@ -42,12 +42,14 @@ public class BeaconServer {
}
public static Process start(String installationBase) throws Exception {
var daemonExecutable = getDaemonDebugExecutable(installationBase);
// Tell daemon that we launched from an external tool
var command = BeaconConfig.launchDaemonInDebugMode()
? XPipeInstallation.createExternalAsyncLaunchCommand(
installationBase, BeaconConfig.getDaemonArguments())
: XPipeInstallation.createExternalLaunchCommand(getDaemonDebugExecutable(installationBase), BeaconConfig.getDaemonArguments());
String command;
if (!BeaconConfig.launchDaemonInDebugMode()) {
command = XPipeInstallation.createExternalAsyncLaunchCommand(installationBase, BeaconConfig.getDaemonArguments());
} else {
command = XPipeInstallation.createExternalLaunchCommand(
getDaemonDebugExecutable(installationBase), BeaconConfig.getDaemonArguments());
}
Process process =
Runtime.getRuntime().exec(ShellTypes.getPlatformDefault().executeCommandWithShell(command));
printDaemonOutput(process, command);
@ -117,8 +119,7 @@ public class BeaconServer {
return FileNames.join(
installationBase, XPipeInstallation.getDaemonDebugAttachScriptPath(pc.getOsType()));
} else {
return FileNames.join(
installationBase, XPipeInstallation.getDaemonDebugScriptPath(pc.getOsType()));
return FileNames.join(installationBase, XPipeInstallation.getDaemonDebugScriptPath(pc.getOsType()));
}
}
}