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

Improve environment variable building

Browse source
This commit is contained in:
crschnick 2024-09-26 10:56:20 +00:00
parent b0a023fabe
commit 5ab9ff282a
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
core/src/main/java/io/xpipe/core/process/CommandBuilder.java
View file

@ -254,12 +254,7 @@ public class CommandBuilder {
return list;
}
public String buildFull(ShellControl sc) throws Exception {
if (sc == null) {
return buildSimple();
}
var s = buildBase(sc);
public Map<String, String> buildEnvironmentVariables(ShellControl sc) throws Exception {
LinkedHashMap<String, String> map = new LinkedHashMap<>();
for (var e : environmentVariables.entrySet()) {
var v = e.getValue().evaluate(sc);
@ -267,6 +262,16 @@ public class CommandBuilder {
map.put(e.getKey(), v);
}
}
return map;
}
public String buildFull(ShellControl sc) throws Exception {
if (sc == null) {
return buildSimple();
}
var s = buildBase(sc);
Map<String, String> map = buildEnvironmentVariables(sc);
return sc.getShellDialect().assembleCommand(s, map);
}