From 326152a62a1089f7d2e4a26bdba5d929729a5d1e Mon Sep 17 00:00:00 2001
From: altalk23 <45172705+altalk23@users.noreply.github.com>
Date: Wed, 28 Jun 2023 18:05:53 +0300
Subject: [PATCH] Update macos postinstall script

---
 installer/mac/Scripts/postinstall | 64 ++++++++++++++++++++++---------
 1 file changed, 45 insertions(+), 19 deletions(-)

diff --git a/installer/mac/Scripts/postinstall b/installer/mac/Scripts/postinstall
index 987169b40..9a6aa032d 100755
--- a/installer/mac/Scripts/postinstall
+++ b/installer/mac/Scripts/postinstall
@@ -4,23 +4,19 @@
 set tmpPath to POSIX path of "/tmp/"
 set binPath to POSIX path of (tmpPath & "geode-install/")
 
+on ExitWithMessage(message)
+    display dialog message
+    do shell script "rm -rf " & binPath
+    error number -128
+end ExitWithMessage
+
 try
     set gdPath to (the POSIX path of (choose file with prompt "Please choose the Geometry Dash application to install Geode to:" of type {"app"}))
 on error
-    display dialog "Prompt cancelled."
-    do shell script "rm -rf " & binPath
-    error number -128
+    ExitWithMessage ("Prompt cancelled.")
 end try
 
 set execPath to (gdPath & "Contents/MacOS/Geometry Dash")
-
-tell application "System Events"
-    if not exists file execPath then
-        display dialog "Not a valid Geometry Dash installation."
-        error number -128
-    end if
-end tell
-
 set frameworkPath to POSIX path of (gdPath & "Contents/Frameworks/")
 set fmodPath to "libfmod.dylib"
 set fmodOriginalPath to "libfmod-original.dylib"
@@ -30,12 +26,42 @@ set resourcesPath to "resources/"
 set newGeodePath to "Contents/geode/"
 set newResourcesPath to (newGeodePath & "resources/geode.loader/")
 
-do shell script "mv -n " & (frameworkPath & fmodPath) & " " & (frameworkPath & fmodOriginalPath)
-do shell script "mv " & (binPath & geodePath) & " " & (frameworkPath & geodePath)
-do shell script "mv " & (binPath & bootstrapperPath) & " " & (frameworkPath & bootstrapperPath)
-do shell script "mv " & (binPath & fmodPath) & " " & (frameworkPath & fmodPath)
-do shell script "mkdir -p " & (gdPath & newResourcesPath)
-do shell script "mv " & (binPath & resourcesPath) & "* " & (gdPath & newResourcesPath)
-do shell script "INSTALLER_USER=$(stat -f '%Su' $HOME) && sudo chown -R $INSTALLER_USER " & frameworkPath
-do shell script "INSTALLER_USER=$(stat -f '%Su' $HOME) && sudo chown -R $INSTALLER_USER " & (gdPath & newGeodePath)
+try
+    tell application "System Events"
+        if not exists file execPath then
+            ExitWithMessage ("Not a valid Geometry Dash installation (executable missing): " & gdPath)
+        end if
+
+        if not exists file (frameworkPath & fmodPath) then
+            ExitWithMessage ("Not a valid Geometry Dash installation (fmod missing): " & gdPath)
+        end if
+    end tell
+on error
+    ExitWithMessage ("Not a valid Geometry Dash installation: " & gdPath)
+end try
+
+try
+    do shell script "mv -n " & (frameworkPath & fmodPath) & " " & (frameworkPath & fmodOriginalPath)
+on error
+    ExitWithMessage ("Moving original fmod failed: " & (frameworkPath & fmodPath))
+end try
+
+try
+    do shell script "mv " & (binPath & geodePath) & " " & (frameworkPath & geodePath)
+    do shell script "mv " & (binPath & bootstrapperPath) & " " & (frameworkPath & bootstrapperPath)
+    do shell script "mv " & (binPath & fmodPath) & " " & (frameworkPath & fmodPath)
+    do shell script "INSTALLER_USER=$(stat -f '%Su' $HOME) && sudo chown -R $INSTALLER_USER " & frameworkPath
+on error
+    ExitWithMessage ("Moving libraries failed: " & frameworkPath)
+end try
+
+try
+    do shell script "mkdir -p " & (gdPath & newResourcesPath)
+    do shell script "mv " & (binPath & resourcesPath) & "* " & (gdPath & newResourcesPath)
+    do shell script "INSTALLER_USER=$(stat -f '%Su' $HOME) && sudo chown -R $INSTALLER_USER " & (gdPath & newGeodePath)
+on error
+    ExitWithMessage ("Moving resources failed: " & (gdPath & newResourcesPath))
+end try
+
+
 do shell script "rm -rf " & binPath