Cleanup lockfile manually and return if script fails

valters-tomsons · Apr 20, 2023 · 587f75a · 587f75a
1 parent 18779c8
commit 587f75a
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/src/DayZLauncher.UnixPatcher.Utils/UnixJunctions.cs b/src/DayZLauncher.UnixPatcher.Utils/UnixJunctions.cs
@@ -92,11 +92,10 @@ private static string RunShellCommand(string command, string arguments)
         Directory.CreateDirectory(basePath);
 
         string uniqueId = Guid.NewGuid().ToString("N");
-        string tempScriptPath = basePath + @$"\tmp_script_{uniqueId}.sh";
         string tempOutputPath = basePath + @$"\tmp_output_{uniqueId}.txt";
         string lockFilePath = basePath + @$"\{uniqueId}.lock";
 
-        Console.WriteLine("UnixJunctions.RunShellCommand: tempScriptPath= " + tempScriptPath + " ;tempOutputPath= " + tempOutputPath);
+        Console.WriteLine($"UnixJunctions.RunShellCommand: tempOutputPath='{tempOutputPath}'");
 
         var script = $"""
         #!/bin/sh
@@ -124,7 +123,14 @@ private static string RunShellCommand(string command, string arguments)
 
             if (process.ExitCode != 0)
             {
-                throw new Exception($"UnixJunctions: Error running shell script '{tempScriptPath}'. Exit code: {process.ExitCode}");
+                Console.WriteLine($"UnixJunctions: Error executing script '{uniqueId}'. Exit code: {process.ExitCode}");
+
+                if (File.Exists(lockFilePath))
+                {
+                    Console.WriteLine($"UnixJunctions: Cleaning up {lockFilePath}");
+                    File.Delete(lockFilePath);
+                    return string.Empty;
+                }
             }
         }
 
@@ -141,12 +147,11 @@ private static string RunShellCommand(string command, string arguments)
         }
 
         // Read the output file
-        string output = File.ReadAllText(tempOutputPath);
-        Console.WriteLine("UnixJunctions.RunShellCommand: output= " + output);
-
+        string scriptOutput = File.ReadAllText(tempOutputPath);
+        Console.WriteLine($"UnixJunctions.RunShellCommand: {uniqueId} output= {scriptOutput}");
         File.Delete(tempOutputPath);
 
-        return output;
+        return scriptOutput;
     }
 
     private static string ToUnixPath(string windowsPath)