From 8e26236f876be86bb3b5282e9b1b7a6744fe792d Mon Sep 17 00:00:00 2001 From: crschnick Date: Wed, 26 Jul 2023 03:11:47 +0000 Subject: [PATCH] Work on cygwin and msys2 support --- .../io/xpipe/core/process/ShellControl.java | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/core/src/main/java/io/xpipe/core/process/ShellControl.java b/core/src/main/java/io/xpipe/core/process/ShellControl.java index 2aeb47cb2..0d2c77e21 100644 --- a/core/src/main/java/io/xpipe/core/process/ShellControl.java +++ b/core/src/main/java/io/xpipe/core/process/ShellControl.java @@ -107,12 +107,8 @@ public interface ShellControl extends ProcessControl { default ShellControl subShell(@NonNull ShellDialect type) { return subShell(p -> type.getOpenCommand(), new TerminalOpenFunction() { - @Override - public boolean changesEnvironment() { - return false; - } - @Override + @Override public String prepare(ShellControl sc, String command) { return command; } @@ -122,19 +118,13 @@ public interface ShellControl extends ProcessControl { interface TerminalOpenFunction { - boolean changesEnvironment(); - String prepare(ShellControl sc, String command) throws Exception; } default ShellControl identicalSubShell() { return subShell(p -> p.getShellDialect().getOpenCommand(), new TerminalOpenFunction() { - @Override - public boolean changesEnvironment() { - return false; - } - @Override + @Override public String prepare(ShellControl sc, String command) { return command; } @@ -144,10 +134,6 @@ public interface ShellControl extends ProcessControl { default ShellControl subShell(@NonNull String command) { return subShell(processControl -> command, new TerminalOpenFunction() { - @Override - public boolean changesEnvironment() { - return false; - } @Override public String prepare(ShellControl sc, String command) {