From 7c0d3197c4780f6a9520d7658a807426fd240171 Mon Sep 17 00:00:00 2001
From: Paul <baconpaul@users.noreply.github.com>
Date: Sat, 3 Jul 2021 17:14:34 -0400
Subject: [PATCH] Mac installer installs the App and FX App now (#4712)

Closes #4400
---
 .../installer_mac/ResourcesPackageScript/postinstall   | 10 +++++++---
 scripts/installer_mac/make_installer.sh                |  6 +++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/scripts/installer_mac/ResourcesPackageScript/postinstall b/scripts/installer_mac/ResourcesPackageScript/postinstall
index 59a4f30d52d..f3cb0a575d2 100755
--- a/scripts/installer_mac/ResourcesPackageScript/postinstall
+++ b/scripts/installer_mac/ResourcesPackageScript/postinstall
@@ -1,4 +1,8 @@
 #!/bin/bash
-rsync -r --delete "/tmp/Surge XT" /Library/Application\ Support/
-chown -R $USER:staff "/Library/Application\ Support/Surge XT"
-rm -rf "/tmp/Surge XT"
+rsync -r --delete "/tmp/SXT/Surge XT" /Library/Application\ Support/
+rsync -r --delete "/tmp/SXT/Surge XT.app" /Applications
+rsync -r --delete "/tmp/SXT/Surge XT Effects.app" /Applications
+chown -R $USER:staff "/Library/Application Support/Surge XT"
+chown -R $USER:staff "/Applications/Surge XT.app"
+chown -R $USER:staff "/Applications/Surge XT Effects.app"
+rm -rf "/tmp/SXT"
diff --git a/scripts/installer_mac/make_installer.sh b/scripts/installer_mac/make_installer.sh
index 997215af5dd..d7aee56ede8 100755
--- a/scripts/installer_mac/make_installer.sh
+++ b/scripts/installer_mac/make_installer.sh
@@ -77,17 +77,17 @@ if [[ -d $INDIR/$FXAU ]]; then
 fi
 
 if [[ -d $INDIR/$APP ]]; then
-    build_flavor "APP" "$APP" "com.surge-synth-team.surge-xt.app.pkg" "/Applications"
+    build_flavor "APP" "$APP" "com.surge-synth-team.surge-xt.app.pkg" "/tmp/SXT"
 fi
 
 if [[ -d $INDIR/$FXAPP ]]; then
-    build_flavor "FXAPP" "$FXAPP" "com.surge-synth-team.surge-xt-fx.app.pkg" "/Applications"
+    build_flavor "FXAPP" "$FXAPP" "com.surge-synth-team.surge-xt-fx.app.pkg" "/tmp/SXT"
 fi
 
 # Build the resources pagkage
 RSRCS=${SOURCEDIR}/resources/data
 echo --- BUILDING Resources pkg ---
-pkgbuild --root "$RSRCS" --identifier "com.surge-synth-team.surge-xt.resources.pkg" --version $VERSION --scripts ${SOURCEDIR}/scripts/installer_mac/ResourcesPackageScript --install-location "/tmp/Surge XT" ${TMPDIR}/Surge_XT_Resources.pkg
+pkgbuild --root "$RSRCS" --identifier "com.surge-synth-team.surge-xt.resources.pkg" --version $VERSION --scripts ${SOURCEDIR}/scripts/installer_mac/ResourcesPackageScript --install-location "/tmp/SXT/Surge XT" ${TMPDIR}/Surge_XT_Resources.pkg
 
 echo --- Sub Packages Created ---
 ls -l "${TMPDIR}"