From 0ac4238dc80fb377a9c984f4f0ad89eca0b3693c Mon Sep 17 00:00:00 2001 From: ME1312 Date: Fri, 9 Apr 2021 17:12:36 -0400 Subject: [PATCH] Remove unnecessary launch flags This allows users on non-linux but unix-based systems to install ports of the `setsid` command that might not be feature complete. --- .../src/net/ME1312/SubServers/Bungee/Host/Executable.java | 4 ++-- .../src/net/ME1312/SubServers/Host/Executable/Executable.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Executable.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Executable.java index 8c2dfaf1..2c6e788f 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Executable.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Executable.java @@ -32,7 +32,7 @@ public class Executable { exec.replace("\\", "/\\").replace("\"", "\\\"").replace("^", "^^").replace("%", "^%").replace("&", "^&").replace("<", "^<").replace(">", "^>").replace("|", "^|") + '"'; cmd = new String[]{"cmd.exe", "/q", "/c", '"'+exec+'"'}; } else if (USE_SESSION_TRACKING) { - cmd = new String[]{"setsid", "-w", "sh", "-lc", exec}; + cmd = new String[]{"setsid", "sh", "-lc", exec}; } else { cmd = new String[]{"sh", "-lc", exec}; } @@ -41,7 +41,7 @@ public class Executable { static { USE_SESSION_TRACKING = Platform.getSystem() != Platform.WINDOWS && Util.getDespiteException(() -> { - Process test = Runtime.getRuntime().exec(new String[]{"setsid", "-w", "bash", "-c", "exit 0"}); + Process test = Runtime.getRuntime().exec(new String[]{"setsid", "bash", "-c", "exit 0"}); test.waitFor(); // The purpose of this block is to test for the 'setsid' command return test.exitValue() == 0; }, false); diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/Executable.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/Executable.java index 67f4b6a3..b6c0f6f9 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/Executable.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/Executable.java @@ -32,7 +32,7 @@ public class Executable { exec.replace("\\", "/\\").replace("\"", "\\\"").replace("^", "^^").replace("%", "^%").replace("&", "^&").replace("<", "^<").replace(">", "^>").replace("|", "^|") + '"'; cmd = new String[]{"cmd.exe", "/q", "/c", '"'+exec+'"'}; } else if (USE_SESSION_TRACKING) { - cmd = new String[]{"setsid", "-w", "sh", "-lc", exec}; + cmd = new String[]{"setsid", "sh", "-lc", exec}; } else { cmd = new String[]{"sh", "-lc", exec}; } @@ -41,7 +41,7 @@ public class Executable { static { USE_SESSION_TRACKING = Platform.getSystem() != Platform.WINDOWS && Util.getDespiteException(() -> { - Process test = Runtime.getRuntime().exec(new String[]{"setsid", "-w", "bash", "-c", "exit 0"}); + Process test = Runtime.getRuntime().exec(new String[]{"setsid", "bash", "-c", "exit 0"}); test.waitFor(); // The purpose of this block is to test for the 'setsid' command return test.exitValue() == 0; }, false);