From d2001fd87b7640c67d1b4c8a3740eae83a5f8ffa Mon Sep 17 00:00:00 2001
From: BWiegell <bj.wiegell@gmail.com>
Date: Thu, 24 Nov 2022 09:49:20 +0100
Subject: [PATCH] another fix to install location

---
 .../ApplicationLayer/Helpers/General.Macos.cs | 11 +++-
 AstroWall/Info.plist                          | 66 +++++++++----------
 2 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/AstroWall/ApplicationLayer/Helpers/General.Macos.cs b/AstroWall/ApplicationLayer/Helpers/General.Macos.cs
index 8dc9a4a..2212547 100644
--- a/AstroWall/ApplicationLayer/Helpers/General.Macos.cs
+++ b/AstroWall/ApplicationLayer/Helpers/General.Macos.cs
@@ -208,7 +208,14 @@ public static void moveBundleToUserApplicationsFolder()
             string symlinkPath = symlinkPathInSystemApplications();
             string currentInstallLocation = GetInstallPath();
 
-            // Move
+            // Remove potential old installation
+            if (Directory.Exists(wantedInstallLocation))
+            {
+                var dir = new DirectoryInfo(wantedInstallLocation);
+                dir.Delete(true);
+            }
+
+            // Move app to user applications folder
             NSTask mvNStask = new NSTask();
             mvNStask.LaunchPath = "/bin/bash";
             mvNStask.Arguments = new string[]
@@ -220,7 +227,7 @@ public static void moveBundleToUserApplicationsFolder()
             mvNStask.WaitUntilExit();
             Console.WriteLine("wanted intern: " + wantedInstallLocation);
 
-            // Link
+            // Link in applications folder
             NSTask linkNStask = new NSTask();
             linkNStask.LaunchPath = "/bin/bash";
             linkNStask.Arguments = new string[]
diff --git a/AstroWall/Info.plist b/AstroWall/Info.plist
index 339a016..ef8228e 100644
--- a/AstroWall/Info.plist
+++ b/AstroWall/Info.plist
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-  <dict>
-    <key>CFBundleName</key>
-    <string>Astro Wall</string>
-    <key>CFBundleIdentifier</key>
-    <string>com.astro.wall.Astro-Wall</string>
-    <key>CFBundleShortVersionString</key>
-    <string>0.1.13</string>
-    <key>CFBundleVersion</key>
-    <string>0.1.13-alpha-1-g04be299</string>
-    <key>LSMinimumSystemVersion</key>
-    <string>11</string>
-    <key>CFBundleDevelopmentRegion</key>
-    <string>en</string>
-    <key>CFBundleInfoDictionaryVersion</key>
-    <string>6.0</string>
-    <key>CFBundlePackageType</key>
-    <string>APPL</string>
-    <key>CFBundleSignature</key>
-    <string>????</string>
-    <key>NSHumanReadableCopyright</key>
-    <string>${AuthorCopyright:HtmlEncode}</string>
-    <key>NSPrincipalClass</key>
-    <string>NSApplication</string>
-    <key>NSMainStoryboardFile</key>
-    <string>Main</string>
-    <key>XSAppIconAssets</key>
-    <string>Assets.xcassets/AppIcon.appiconset</string>
-    <key>LSUIElement</key>
-    <true/>
-    <key>BUNDLE VERSION COMMENT</key>
-    <string>Bundle version is updated "after" a commit has been made (because it needs to reflect the commit hash). Therefore its always "one commit behind" in version history, but is updated to actual version on build.</string>
-  </dict>
-</plist>
\ No newline at end of file
+<dict>
+	<key>CFBundleName</key>
+	<string>Astro Wall</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.astro.wall.Astro-Wall</string>
+	<key>CFBundleShortVersionString</key>
+	<string>0.1.14</string>
+	<key>CFBundleVersion</key>
+	<string>0.1.14-alpha-1-g04be299</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>11</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>${AuthorCopyright:HtmlEncode}</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>NSMainStoryboardFile</key>
+	<string>Main</string>
+	<key>XSAppIconAssets</key>
+	<string>Assets.xcassets/AppIcon.appiconset</string>
+	<key>LSUIElement</key>
+	<true/>
+	<key>BUNDLE VERSION COMMENT</key>
+	<string>Bundle version is updated &quot;after&quot; a commit has been made (because it needs to reflect the commit hash). Therefore its always &quot;one commit behind&quot; in version history, but is updated to actual version on build.</string>
+</dict>
+</plist>