Fix JENKINS-13157

jenkinsci · Mar 21, 2012 · 7cad840 · 7cad840
1 parent 8c84404
commit 7cad840
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/envinject/service/EnvInjectEnvVars.java b/src/main/java/org/jenkinsci/plugins/envinject/service/EnvInjectEnvVars.java
@@ -166,7 +166,8 @@ public void resolveVars(Map<String, String> variables, Map<String, String> env)
 
         //Resolve variables against env
         for (Map.Entry<String, String> entry : variables.entrySet()) {
-            entry.setValue(Util.replaceMacro(entry.getValue(), env));
+            String value = Util.replaceMacro(entry.getValue(), env);
+            entry.setValue(value);
         }
 
         //Resolve variables against variables itself
@@ -193,7 +194,7 @@ private Map<String, String> removeUnsetVars(Map<String, String> envVars) {
         Map<String, String> result = new HashMap<String, String>();
         for (Map.Entry<String, String> entry : envVars.entrySet()) {
             if (!isUnresolvedVar(entry.getValue())) {
-                result.put(entry.getKey(), entry.getValue());
+                result.put(entry.getKey(), removeEscapeDollar(entry.getValue()));
             } else {
                 logger.info(String.format("Unset unresolved '%s' variable.", entry.getKey()));
             }
@@ -202,7 +203,11 @@ private Map<String, String> removeUnsetVars(Map<String, String> envVars) {
     }
 
     private boolean isUnresolvedVar(String value) {
-        return value != null && value.contains("$");
+        return value != null && value.contains("$") && !value.contains("\\$");
+    }
+
+    private String removeEscapeDollar(String value) {
+        return value.replace("\\$", "$");
     }
 
 }