mirror of
https://github.com/xpipe-io/xpipe.git
synced 2024-09-02 02:31:21 +12:00
Fix bug in beacon server launch (again)
This commit is contained in:
parent
e0d9b7cff2
commit
ec10f3dcab
1 changed files with 9 additions and 8 deletions
|
@ -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()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue