From ddf9d4b2bf73e1457dde3990ba7af6838bbd6333 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Thu, 27 Oct 2011 09:19:11 -0700
Subject: [PATCH] env variable expansion needs to happen first if we want to
 really detect whitespace in arguments correctly

cherry picked c542409b1703870923c782556cb19280af76ff46
---
 ServiceDescriptor.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ServiceDescriptor.cs b/ServiceDescriptor.cs
index a8a5edd..58590dd 100755
--- a/ServiceDescriptor.cs
+++ b/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;
             }
         }