mirror of https://github.com/winsw/winsw
env variable expansion needs to happen first if we want to really detect whitespace in arguments correctly
git-svn-id: https://svn.kenai.com/svn/winsw~subversion/trunk@46 c8b2a3fe-9b5b-6a51-a37e-dc31b0e308faremotes/git-svn
parent
dea77d9804
commit
c542409b17
4
Main.cs
4
Main.cs
|
@ -196,7 +196,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("\""))
|
||||||
{
|
{
|
||||||
// for backward compatibility, if the argument is already quoted, leave it as is.
|
// for backward compatibility, if the argument is already quoted, leave it as is.
|
||||||
|
@ -213,7 +213,7 @@ namespace winsw
|
||||||
arguments += " " + token;
|
arguments += " " + token;
|
||||||
}
|
}
|
||||||
|
|
||||||
return Environment.ExpandEnvironmentVariables(arguments);
|
return arguments;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue