summaryrefslogtreecommitdiffstats
path: root/api/src/main/java/org/openslx/taskmanager/api/SystemCommandTask.java
diff options
context:
space:
mode:
authorSimon Rettberg2020-02-25 14:21:39 +0100
committerSimon Rettberg2020-02-25 14:21:39 +0100
commit5c27d5800d7c4a9c1a5d41c6ce427156652b74b0 (patch)
treeadde27c2a2c7cdff77c69d47a97e4627a675e924 /api/src/main/java/org/openslx/taskmanager/api/SystemCommandTask.java
parentDeserialize Strings to UTF-8 byte[] (diff)
downloadtaskman-lite-5c27d5800d7c4a9c1a5d41c6ce427156652b74b0.tar.gz
taskman-lite-5c27d5800d7c4a9c1a5d41c6ce427156652b74b0.tar.xz
taskman-lite-5c27d5800d7c4a9c1a5d41c6ce427156652b74b0.zip
Move Environment class to API, fix loading from file
Diffstat (limited to 'api/src/main/java/org/openslx/taskmanager/api/SystemCommandTask.java')
-rw-r--r--api/src/main/java/org/openslx/taskmanager/api/SystemCommandTask.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/api/src/main/java/org/openslx/taskmanager/api/SystemCommandTask.java b/api/src/main/java/org/openslx/taskmanager/api/SystemCommandTask.java
index 18c8ecc..c1aa6e5 100644
--- a/api/src/main/java/org/openslx/taskmanager/api/SystemCommandTask.java
+++ b/api/src/main/java/org/openslx/taskmanager/api/SystemCommandTask.java
@@ -48,7 +48,12 @@ public abstract class SystemCommandTask extends AbstractTask
ProcessBuilder pb = new ProcessBuilder( command );
pb.directory( new File( "/" ) );
- initEnvironment( pb.environment() );
+ Map<String, String> env = pb.environment();
+ if ( Environment.get() != null ) {
+ env.clear();
+ env.putAll( Environment.get() );
+ }
+ initEnvironment( env );
try {