Make sure that torrent-client is executable before running it

Author: genail

Assets/PatchKit Patcher/Scripts/AppData/Remote/Downloaders/TorrentClient.cs

@@ -15,6 +15,9 @@ namespace PatchKit.Unity.Patcher.AppData.Remote.Downloaders
     /// <seealso cref="System.IDisposable" />
     public class TorrentClient : IDisposable
     {
+        private const string TorrentClientWinPath = "torrent-client/win/torrent-client.exe";
+        private const string TorrentClientOsx64Path = "torrent-client/osx64/torrent-client";
+        private const string TorrentClientLinux64Path = "torrent-client/linux64/torrent-client";
         private static readonly DebugLogger DebugLogger = new DebugLogger(typeof(TorrentClient));
 
         private string _streamingAssetsPath;
@@ -116,7 +119,7 @@ private ProcessStartInfo GetProcessStartInfo()
             {
                 var processStartInfo = new ProcessStartInfo
                 {
-                    FileName = _streamingAssetsPath.PathCombine("torrent-client/win/torrent-client.exe"),
+                    FileName = _streamingAssetsPath.PathCombine(TorrentClientWinPath),
                     RedirectStandardInput = true,
                     RedirectStandardOutput = true,
                     UseShellExecute = false,
@@ -130,13 +133,16 @@ private ProcessStartInfo GetProcessStartInfo()
             {
                 var processStartInfo = new ProcessStartInfo
                 {
-                    FileName = _streamingAssetsPath.PathCombine("torrent-client/osx64/torrent-client"),
+                    FileName = _streamingAssetsPath.PathCombine(TorrentClientOsx64Path),
                     RedirectStandardInput = true,
                     RedirectStandardOutput = true,
                     UseShellExecute = false,
                     CreateNoWindow = true
                 };
 
+                // make sure that binary can be executed
+                Chmod.SetExecutableFlag(processStartInfo.FileName);
+
                 processStartInfo.EnvironmentVariables["DYLD_LIBRARY_PATH"] = Path.Combine(_streamingAssetsPath, "torrent-client/osx64");
 
                 return processStartInfo;
@@ -146,13 +152,16 @@ private ProcessStartInfo GetProcessStartInfo()
             {
                 var processStartInfo = new ProcessStartInfo
                 {
-                    FileName = _streamingAssetsPath.PathCombine("torrent-client/linux64/torrent-client"),
+                    FileName = _streamingAssetsPath.PathCombine(TorrentClientLinux64Path),
                     RedirectStandardInput = true,
                     RedirectStandardOutput = true,
                     UseShellExecute = false,
                     CreateNoWindow = true
                 };
 
+                // make sure that binary can be executed
+                Chmod.SetExecutableFlag(processStartInfo.FileName);
+
                 processStartInfo.EnvironmentVariables["LD_LIBRARY_PATH"] = Path.Combine(_streamingAssetsPath, "torrent-client/linux64");
 
                 return processStartInfo;

Assets/PatchKit Patcher/Scripts/AppStarter.cs

@@ -46,7 +46,7 @@ public void Start()
                     string filePath = _app.LocalDirectory.Path.PathCombine(fileName);
                     if (IsExecutable(filePath, platformType))
                     {
-                        Chmod(filePath, "+x");
+                        Chmod.SetExecutableFlag(filePath);
                     }
                 }
             }
@@ -108,26 +108,6 @@ private ProcessStartInfo GetProcessStartInfo(string executablePath, PlatformType
             }
         }
 
-        private void Chmod(string filePath, string permissions)
-        {
-            var process = new Process
-            {
-                StartInfo =
-                {
-                    FileName = "/bin/chmod",
-                    Arguments = string.Format("{0} \"{1}\"", permissions, filePath)
-                }
-            };
-
-            DebugLogger.Log(string.Format("Executing {0} {1}...", process.StartInfo.FileName,
-                process.StartInfo.Arguments));
-
-            process.Start();
-            process.WaitForExit();
-
-            DebugLogger.Log("Done");
-        }
-
         private void StartAppProcess(ProcessStartInfo processStartInfo)
         {
             DebugLogger.Log(string.Format("Starting process '{0}' with arguments '{1}'", processStartInfo.FileName,

Assets/PatchKit Patcher/Scripts/Utilities/Chmod.cs

@@ -0,0 +1,44 @@
+using System.Diagnostics;
+using System.IO;
+using System.Net;
+using PatchKit.Unity.Patcher.Debug;
+
+namespace PatchKit.Unity.Utilities
+{
+
+public class Chmod
+{
+    private const string ChmodPath = "/bin/chmod";
+
+    private static readonly DebugLogger DebugLogger = new DebugLogger(typeof(Chmod));
+
+    public static void SetExecutableFlag(string path, bool val = true)
+    {
+        Execute(val ? "+x" : "-x", path);
+    }
+
+    private static void Execute(string param, string path)
+    {
+        Assert.IsTrue(Platform.IsPosix(), "Chmod can be run only on POSIX platforms");
+        Assert.IsTrue(File.Exists(ChmodPath), "/bin/chmod should exist");
+
+        var process = new Process
+        {
+            StartInfo =
+            {
+                FileName = ChmodPath,
+                Arguments = string.Format("{0} \"{1}\"", param, path)
+            }
+        };
+
+        DebugLogger.Log(string.Format("Executing {0} {1}...", process.StartInfo.FileName,
+            process.StartInfo.Arguments));
+
+        process.Start();
+        process.WaitForExit();
+
+        DebugLogger.Log("Done");
+    }
+}
+
+} // namespace

Assets/PatchKit Patcher/Scripts/Utilities/Chmod.cs.meta

@@ -49,6 +49,11 @@ public static bool IsLinux()
             return IsOneOf(RuntimePlatform.LinuxPlayer, RuntimePlatform.LinuxEditor);
         }
 
+        public static bool IsPosix()
+        {
+            return IsLinux() || IsOSX();
+        }
+
         public static bool IsOneOf(params RuntimePlatform[] platforms)
         {
             var runtimePlatform = GetRuntimePlatform();