Browse Source

env variable expansion needs to happen first if we want to really detect
whitespace in arguments correctly

cherry picked c542409b1703870923c782556cb19280af76ff46

Kohsuke Kawaguchi 14 years ago
parent
commit
ddf9d4b2bf
1 changed files with 2 additions and 2 deletions
  1. 2 2
      ServiceDescriptor.cs

+ 2 - 2
ServiceDescriptor.cs

@@ -173,7 +173,7 @@ namespace winsw
 
                 foreach (XmlNode argument in dom.SelectNodes("//" + tagName))
                 {
-                    string token = argument.InnerText;
+                    string token = Environment.ExpandEnvironmentVariables(argument.InnerText);
 
                     if (token.StartsWith("\"") && token.EndsWith("\""))
                     {
@@ -191,7 +191,7 @@ namespace winsw
                     arguments += " " + token;
                 }
 
-                return Environment.ExpandEnvironmentVariables(arguments);
+                return arguments;
             }
         }