diff --git a/Main.cs b/Main.cs index c628f13..9fa010c 100644 --- a/Main.cs +++ b/Main.cs @@ -78,13 +78,29 @@ namespace winsw } /// - /// Arguments + /// Arguments or multiple optional argument elements which overrule the arguments element. /// public string Arguments { get { - return SingleElement("arguments"); + XmlNode argumentNode = dom.SelectSingleNode("//argument"); + + if (argumentNode == null) + { + return SingleElement("arguments"); + } + else + { + string arguments = ""; + + foreach (XmlNode argument in dom.SelectNodes("//argument")) + { + arguments += " " + argument.InnerText; + } + + return Environment.ExpandEnvironmentVariables(arguments); + } } }