Merge pull request #109 from patchkit-net/feature/v3.11.x/1115-osx-executable-args-issue

Feature/v3.11.x/1115 osx executable args issue

Author: witcher112

Assets/PatchKit Patcher/Scripts/AppStarter.cs

@@ -29,11 +29,17 @@ public AppStarter(App app)
 
         private string ResolveExecutablePath(AppVersion appVersion)
         {
+            PlatformType platformType = Platform.GetPlatformType();
+
             if (!string.IsNullOrEmpty(appVersion.MainExecutable))
             {
                 string executablePath = Path.Combine(_app.LocalDirectory.Path, appVersion.MainExecutable);
 
-                if (File.Exists(executablePath))
+                bool isOSXApp = platformType == PlatformType.OSX &&
+                                executablePath.EndsWith(".app") &&
+                                Directory.Exists(executablePath);
+                
+                if (File.Exists(executablePath) || isOSXApp)
                 {
                     return executablePath;
                 }
@@ -50,7 +56,6 @@ private string ResolveExecutablePath(AppVersion appVersion)
 
             }
 
-            PlatformType platformType = Platform.GetPlatformType();
             return AppFinder.FindExecutable(_app.LocalDirectory.Path, platformType);
         }
 
@@ -87,12 +92,7 @@ private void StartAppVersion(AppVersion appVersion)
                 }
             }
 
-            var processStartInfo = GetProcessStartInfo(appFilePath, platformType);
-
-            if (!string.IsNullOrEmpty(appVersion.MainExecutableArgs))
-            {
-                processStartInfo.Arguments += " " + appVersion.MainExecutableArgs;
-            }
+            var processStartInfo = GetProcessStartInfo(appFilePath, appVersion.MainExecutableArgs, platformType);
 
             StartAppProcess(processStartInfo);
         }
@@ -102,8 +102,13 @@ private bool NeedPermissionFix(PlatformType platformType)
             return platformType == PlatformType.OSX || platformType == PlatformType.Linux;
         }
 
-        private ProcessStartInfo GetProcessStartInfo(string executablePath, PlatformType platform)
+        private ProcessStartInfo GetProcessStartInfo(string executablePath, string mainExecutableArgs, PlatformType platform)
         {
+            if (mainExecutableArgs == null)
+            {
+                mainExecutableArgs = string.Empty;
+            }
+
             string workingDir = Path.GetDirectoryName(executablePath) ?? string.Empty;
             switch (platform)
             {
@@ -113,20 +118,26 @@ private ProcessStartInfo GetProcessStartInfo(string executablePath, PlatformType
                     return new ProcessStartInfo
                     {
                         FileName = executablePath,
-                        Arguments = string.Format("+patcher-data-location \"{0}\"", _app.LocalMetaData.GetFilePath()),
+                        Arguments = string.Format("+patcher-data-location \"{0}\" " + mainExecutableArgs, _app.LocalMetaData.GetFilePath()),
                         WorkingDirectory = workingDir
                     };
                 case PlatformType.OSX:
+                    if (!string.IsNullOrEmpty(mainExecutableArgs))
+                    {
+                        mainExecutableArgs = " --args " + mainExecutableArgs;
+                    }
+
                     return new ProcessStartInfo
                     {
                         FileName = "open",
-                        Arguments = string.Format("\"{0}\"", executablePath),
+                        Arguments = string.Format("\"{0}\"{1}", executablePath, mainExecutableArgs),
                         WorkingDirectory = workingDir
                     };
                 case PlatformType.Linux:
                     return new ProcessStartInfo
                     {
                         FileName = executablePath,
+                        Arguments = mainExecutableArgs,
                         WorkingDirectory = workingDir
                     };
                 default: