env variable expansion needs to happen first if we want to really detect

whitespace in arguments correctly

cherry picked c542409b17
pull/4/head
Kohsuke Kawaguchi 2011-10-27 09:19:11 -07:00
parent 088cfd232a
commit ddf9d4b2bf
1 changed files with 2 additions and 2 deletions

View File

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