Fix a potential related-path issue.

HeddaZ · Dec 17, 2015 · c11137e · c11137e
1 parent eb37c60
commit c11137e
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 100 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@
 *.suo
 *.user
 *.sln.docstates
+.vs/
 
 # Build results
 

diff --git a/ServiceOnset/Config/ServiceOnsetConfig.cs b/ServiceOnset/Config/ServiceOnsetConfig.cs
@@ -120,9 +120,13 @@ public string Command
                     {
                         throw new ArgumentNullException("command");
                     }
-                    else if (!Path.IsPathRooted(_originalCommand))
+                    else if (Path.IsPathRooted(_originalCommand))
                     {
-                        #region 程序路径、工作目录或系统路径
+                        _command = _originalCommand;
+                    }
+                    else
+                    {
+                        #region 非完整路径，尝试匹配程序路径、工作目录、系统路径
 
                         string possibleCommand = Path.Combine(AppHelper.AppDirectory, _originalCommand);
                         if (CommandExists(possibleCommand))
@@ -131,30 +135,22 @@ public string Command
                         }
                         else
                         {
-                            if (!string.IsNullOrWhiteSpace(_originalWorkingDirectory))
+                            if (string.IsNullOrWhiteSpace(_originalWorkingDirectory))
                             {
-                                possibleCommand = Path.Combine(_originalWorkingDirectory, _originalCommand);
-                                if (CommandExists(possibleCommand))
-                                {
-                                    _originalCommand = possibleCommand;
-                                }
-                                else
-                                {
-                                    //系统路径无需处理，自动应用 Path 环境变量
-                                    _command = _originalCommand;
-                                }
+                                _command = _originalCommand;
                             }
                             else
                             {
-                                _command = _originalCommand;
+                                possibleCommand = Path.IsPathRooted(_originalWorkingDirectory)
+                                    ? Path.Combine(_originalWorkingDirectory, _originalCommand)
+                                    : Path.Combine(AppHelper.AppDirectory, _originalWorkingDirectory, _originalCommand);
+                                _command = CommandExists(possibleCommand)
+                                    ? possibleCommand
+                                    : _originalCommand;
                             }
                         }
 
-                        #endregion
-                    }
-                    else
-                    {
-                        _command = _originalCommand;
+                        #endregion                        
                     }
                 }
                 return _command;
@@ -183,7 +179,9 @@ public string WorkingDirectory
                 {
                     _workingDirectory = string.IsNullOrWhiteSpace(_originalWorkingDirectory)
                         ? Path.GetDirectoryName(this.Command)
-                        : _originalWorkingDirectory;
+                        : (Path.IsPathRooted(_originalWorkingDirectory)
+                            ? _originalWorkingDirectory
+                            : Path.Combine(AppHelper.AppDirectory, _originalWorkingDirectory));
                 }
                 return _workingDirectory;
             }

diff --git a/ServiceOnset/ServiceManager.cs.orig b/ServiceOnset/ServiceManager.cs.orig
diff --git a/ServiceOnset/ServiceOnset.exe.json b/ServiceOnset/ServiceOnset.exe.json
@@ -1,27 +1,27 @@
 {
-	"enableLog": true,
-	"services": [
-		{
-			"name": "PingBaidu",
-			"command": "ping",
-			"arguments": "www.baidu.com",
-			"workingDirectory": "",
-			"runMode": "interval",
-			"intervalInSeconds": 10,
-			"useShellExecute": false,
-			"killExistingProcess": false,
-			"enableLog": true
-		},
-        {
-            "name": "mywin_AppPath",
-            "command": "mywin",
-            "killExistingProcess": true
-        },
-        {
-			"name": "mywin_RelativePath",
-            "command": "test\\mywin.exe",
-            "runMode": "interval",
-			"killExistingProcess": true
-		}
-	]
+  "enableLog": true,
+  "services": [
+    {
+      "name": "PingBaidu",
+      "command": "ping",
+      "arguments": "www.baidu.com",
+      "workingDirectory": "",
+      "runMode": "interval",
+      "intervalInSeconds": 10,
+      "useShellExecute": false,
+      "killExistingProcess": false,
+      "enableLog": true
+    },
+    {
+      "name": "mywin_AppPath",
+      "command": "mywin",
+      "killExistingProcess": true
+    },
+    {
+      "name": "mywin_RelativePath",
+      "command": "test\\mywin.exe",
+      "runMode": "interval",
+      "killExistingProcess": true
+    }
+  ]
 }