mirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-05-24 08:18:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rework shell terminal command handling and clipboards

Browse Source
This commit is contained in:
crschnick
2023-12-19 14:55:50 +00:00
parent 2af59af190
commit 4daa183dad
8 changed files with 57 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/main/java/io/xpipe/core/process/ShellControl.java
View File

@@ -172,22 +172,26 @@ public interface ShellControl extends ProcessControl {
FailableSupplier<SecretValue> getElevationPassword();
default ShellControl subShell(@NonNull ShellDialect type) {
return subShell(p -> type.getOpenCommand(), (sc, command) -> command != null ? command : type.getLoginOpenCommand())
return subShell(p -> type.getOpenCommand(), (sc) -> type.getLoginOpenCommand())
.elevationPassword(getElevationPassword());
}
interface TerminalOpenFunction {
String prepare(ShellControl sc, String command) throws Exception;
String prepareWithoutInitCommand(ShellControl sc) throws Exception;
default String prepareWithInitCommand(ShellControl sc, @NonNull String command) throws Exception {
return command;
}
}
default ShellControl identicalSubShell() {
return subShell(p -> p.getShellDialect().getOpenCommand(), (sc, command) -> command)
return subShell(p -> p.getShellDialect().getOpenCommand(), (sc) -> sc.getShellDialect().getOpenCommand())
.elevationPassword(getElevationPassword());
}
default ShellControl subShell(@NonNull String command) {
return subShell(processControl -> command, (sc, command1) -> command1);
return subShell(processControl -> command, (sc) -> command);
}
default ShellControl enforcedDialect(ShellDialect type) throws Exception {