beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-09-19 22:01:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

More fixes for beacon server start up

Browse source
This commit is contained in:
Christopher Schnick 2022-12-16 13:53:26 +01:00
parent 0798c53762
commit afd5dd4553
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,11 +30,13 @@ public class BeaconServer {
public static Process tryStartCustom() throws Exception { public static Process tryStartCustom() throws Exception {
var custom = BeaconConfig.getCustomDaemonCommand(); var custom = BeaconConfig.getCustomDaemonCommand();
if (custom != null) { if (custom != null) {
var command = var command = ShellTypes.getPlatformDefault()
ShellTypes.getPlatformDefault().executeCommandWithShell( .executeCommandListWithShell(custom
custom + (BeaconConfig.getDaemonArguments() != null ? " " + BeaconConfig.getDaemonArguments() : "")); + (BeaconConfig.getDaemonArguments() != null
Process process = Runtime.getRuntime().exec(command); ? " " + BeaconConfig.getDaemonArguments()
printDaemonOutput(process, command); : ""));
Process process = Runtime.getRuntime().exec(command.toArray(String[]::new));
printDaemonOutput(process, ShellTypes.getPlatformDefault().flatten(command));
return process; return process;
} }
return null; return null;
@ -45,7 +47,8 @@ public class BeaconServer {
// Tell daemon that we launched from an external tool // Tell daemon that we launched from an external tool
var command = "\"" + daemonExecutable + "\" --external " var command = "\"" + daemonExecutable + "\" --external "
+ (BeaconConfig.getDaemonArguments() != null ? BeaconConfig.getDaemonArguments() : ""); + (BeaconConfig.getDaemonArguments() != null ? BeaconConfig.getDaemonArguments() : "");
Process process = Runtime.getRuntime().exec(ShellTypes.getPlatformDefault().executeCommandWithShell(command)); Process process =
Runtime.getRuntime().exec(ShellTypes.getPlatformDefault().executeCommandWithShell(command));
printDaemonOutput(process, command); printDaemonOutput(process, command);
return process; return process;
} }

2
core/src/main/java/io/xpipe/core/process/ShellType.java
View file

@ -74,6 +74,8 @@ public interface ShellType {
String executeCommandWithShell(String cmd); String executeCommandWithShell(String cmd);
List<String> executeCommandListWithShell(String cmd);
List<String> createMkdirsCommand(String dirs); List<String> createMkdirsCommand(String dirs);
String createFileReadCommand(String file); String createFileReadCommand(String file);