mirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-04-26 01:17:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

More shell fixes

Browse Source
This commit is contained in:
Christopher Schnick
2022-12-10 04:33:40 +01:00
parent 1ca9e2c751
commit 9f9eccffdd
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/io/xpipe/core/process/ShellProcessControl.java
View File

@@ -64,8 +64,8 @@ public interface ShellProcessControl extends ProcessControl {
SecretValue getElevationPassword();
default ShellProcessControl subShell(@NonNull ShellType type) {
return subShell(p -> type.openCommand(), (shellProcessControl, s) -> {
return s == null ? type.openCommand() : type.switchTo(s);
return subShell(p -> type.getNormalOpenCommand(), (shellProcessControl, s) -> {
return s == null ? type.getNormalOpenCommand() : type.executeCommandWithShell(s);
})
.elevation(getElevationPassword());
}

10
core/src/main/java/io/xpipe/core/process/ShellType.java
View File

@@ -20,7 +20,7 @@ public interface ShellType {
String createInitFileContent(String command);
String getOpenWithInitFileCommand(String file);
String getFileOpenCommand(String file);
default String flatten(List<String> command) {
return command.stream()
@@ -48,10 +48,6 @@ public interface ShellType {
return ";";
}
default String getAndConcatenationOperator() {
return "&&";
}
default String getOrConcatenationOperator() {
return "||";
}
@@ -74,9 +70,9 @@ public interface ShellType {
String getPrintVariableCommand(String prefix, String name);
String openCommand();
String getNormalOpenCommand();
String switchTo(String cmd);
String executeCommandWithShell(String cmd);
List<String> createMkdirsCommand(String dirs);