From f0f89ac6af8770dd41aa29459f63311145ffd324 Mon Sep 17 00:00:00 2001
From: Konstantin <johnysalvesen@gmail.com>
Date: Fri, 5 Nov 2021 21:30:07 +0300
Subject: [PATCH] Some Mac updater improvements;

---
 Atomex.Client.Desktop.csproj | 4 ++--
 Common/MacUpdater.cs         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Atomex.Client.Desktop.csproj b/Atomex.Client.Desktop.csproj
index 7fff3b27..c57d1ad9 100644
--- a/Atomex.Client.Desktop.csproj
+++ b/Atomex.Client.Desktop.csproj
@@ -7,8 +7,8 @@
         <UseAppHost>true</UseAppHost>
         <ApplicationIcon>Resources/Images/logo_dark_256x256.ico</ApplicationIcon>
 
-        <AssemblyVersion>1.1.53</AssemblyVersion>
-        <Version>1.1.53</Version>
+        <AssemblyVersion>1.1.54</AssemblyVersion>
+        <Version>1.1.54</Version>
     </PropertyGroup>
     <ItemGroup>
         <AvaloniaResource Include="Assets\**" />
diff --git a/Common/MacUpdater.cs b/Common/MacUpdater.cs
index 413dbbc2..b8b83d2a 100644
--- a/Common/MacUpdater.cs
+++ b/Common/MacUpdater.cs
@@ -201,7 +201,7 @@ protected virtual async Task RunDownloadedInstaller(string downloadFilePath)
                     if (IsZipDownload(downloadFilePath)) // .zip on macOS or .tar.gz on Linux
                     {
                         var tarCommand = isMacOS
-                            ? $"tar -x -f {downloadFilePath} -C \"{workingDir}\""
+                            ? $"tar -x -f {downloadFilePath} -C \"{workingDir}{AppName}\" --strip-components=1"
                             : $"tar -xf {downloadFilePath} -C \"{workingDir}\" --overwrite";
 
                         var rmCommand = $"rm {downloadFilePath}";
@@ -242,7 +242,7 @@ protected virtual async Task RunDownloadedInstaller(string downloadFilePath)
         <array>
             <string>/bin/bash</string>
             <string>-c</string>
-            <string>/usr/bin/open {workingDir}{AppName};launchctl unload -w {LaunchdDirFilePath}</string>
+            <string>/usr/bin/open ""{workingDir}{AppName}"";launchctl unload -w {LaunchdDirFilePath}</string>
         </array>
    </dict>
 </plist>