beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-21 23:20:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rework shell dialect names for bsd sh support

Browse source
This commit is contained in:
crschnick 2024-01-01 14:24:26 +00:00
parent f67e9ad247
commit ae52ab7e53
2 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -26,6 +26,8 @@ public interface ShellDialect {
.collect(Collectors.joining(" "));
}
String getExecutableName();
default boolean isSupportedShell() {
return true;
}

30
core/src/main/java/io/xpipe/core/process/ShellDialects.java
View file

@ -15,6 +15,7 @@ public class ShellDialects {
public static ShellDialect CMD;
public static ShellDialect ASH;
public static ShellDialect SH;
public static ShellDialect SH_BSD;
public static ShellDialect DASH;
public static ShellDialect BASH;
public static ShellDialect ZSH;
@ -35,19 +36,20 @@ public class ShellDialects {
ALL.add(moduleLayerLoaderProvider.get());
});
CMD = byName("cmd");
POWERSHELL = byName("powershell");
POWERSHELL_CORE = byName("pwsh");
OPNSENSE = byName("opnsense");
FISH = byName("fish");
DASH = byName("dash");
BASH = byName("bash");
ZSH = byName("zsh");
CSH = byName("csh");
ASH = byName("ash");
SH = byName("sh");
UNSUPPORTED = byName("unsupported");
CISCO = byName("cisco");
CMD = byId("cmd");
POWERSHELL = byId("powershell");
POWERSHELL_CORE = byId("pwsh");
OPNSENSE = byId("opnsense");
FISH = byId("fish");
DASH = byId("dash");
BASH = byId("bash");
ZSH = byId("zsh");
CSH = byId("csh");
ASH = byId("ash");
SH = byId("sh");
SH_BSD = byId("shBsd");
UNSUPPORTED = byId("unsupported");
CISCO = byId("cisco");
}
@Override
@ -61,7 +63,7 @@ public class ShellDialects {
}
}
private static ShellDialect byName(String name) {
private static ShellDialect byId(String name) {
return ALL.stream()
.filter(shellType -> shellType.getId().equals(name))
.findFirst()