Merge pull request #4 from clalarco/master

Idea to solve env vars issue: modified regex pattern
jenkinsci · Sep 24, 2012 · 02be37f · 02be37f
2 parents 73d09df + 2d04952
commit 02be37f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/hudson/plugins/xshell/XShellBuilder.java b/src/main/java/hudson/plugins/xshell/XShellBuilder.java
@@ -28,8 +28,8 @@
 public final class XShellBuilder extends Builder {
 
   private static final Logger LOG = Logger.getLogger(XShellBuilder.class.getName());
-  private static final Pattern WIN_ENV_VAR_REGEX = Pattern.compile("%(\\S+?)%");
-  private static final Pattern UNIX_ENV_VAR_REGEX = Pattern.compile("\\$(\\S+)");
+  private static final Pattern WIN_ENV_VAR_REGEX = Pattern.compile("%(%([a-zA-Z0-9_]+)%)%");
+  private static final Pattern UNIX_ENV_VAR_REGEX = Pattern.compile("\\$([a-zA-Z0-9_]+)");
 
   @Extension
   public static final XShellDescriptor DESCRIPTOR = new XShellDescriptor();