[FIXED JENKINS-29055] Change logic to add parameters to the binding c…

…ontext of the Scriptler script. Then expand parameters used in the script too.
jenkinsci · Jun 28, 2015 · 878f509 · 878f509
1 parent 2bdb50d
commit 878f509
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/main/java/org/biouno/unochoice/model/ScriptlerScript.java b/src/main/java/org/biouno/unochoice/model/ScriptlerScript.java
@@ -90,6 +90,9 @@ public Object eval(Map<String, String> parameters) {
         Map<String, String> evaledParameters = new HashMap<String, String>();
         // if we have any parameter that came from UI, let's eval and use them
         if (parameters != null && parameters.size() > 0) {
+        	// fill our map with the given parameters
+        	evaledParameters.putAll(parameters);
+        	// and now try to expand env vars
             for (String key : this.getParameters().keySet()) {
                 String value = this.getParameters().get(key);
                 value = Util.replaceMacro((String) value, parameters);