From 740b1ab3636eea4487895e9e23dacfd6f7b6e8dd Mon Sep 17 00:00:00 2001
From: Jesse Chappell <jesse@sonosaurus.com>
Date: Fri, 22 Apr 2022 10:29:22 -0400
Subject: [PATCH] fixed windows installer issues

---
 release/distwin.sh       | 9 +++++----
 release/wininstaller.iss | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/release/distwin.sh b/release/distwin.sh
index 9b4c275..381f196 100755
--- a/release/distwin.sh
+++ b/release/distwin.sh
@@ -23,13 +23,14 @@ BUILDDIR32="../build32/${BASENAME}_artefacts/Release"
 #BUILDDIR32='../Builds/VisualStudio2019/Win32/Release32'
 
 rm -rf ${BASENAME}/Plugins
-mkdir -p ${BASENAME}/Plugins
+mkdir -p ${BASENAME}/Plugins/VST3 
+mkdir -p ${BASENAME}/Plugins/AAX
 
 #cp -v ../doc/README_WINDOWS.txt SonoBus/README.txt
 cp -v ${BUILDDIR}/Standalone\ Plugin/${BASENAME}.exe ${BASENAME}/
-cp -pHLRv ${BUILDDIR}/VST3/${BASENAME}.vst3 ${BASENAME}/Plugins/
+cp -pHLRv ${BUILDDIR}/VST3/${BASENAME}.vst3 ${BASENAME}/Plugins/VST3/
 #cp -v ${BUILDDIR}/VST/SonoBus.dll ${BASENAME}/Plugins/
-cp -pHLRv ${BUILDDIR}/AAX/${BASENAME}.aaxplugin ${BASENAME}/Plugins/
+cp -pHLRv ${BUILDDIR}/AAX/${BASENAME}.aaxplugin ${BASENAME}/Plugins/AAX/
 
 
 #mkdir -p SonoBus/Plugins32
@@ -43,7 +44,7 @@ cp -pHLRv ${BUILDDIR}/AAX/${BASENAME}.aaxplugin ${BASENAME}/Plugins/
 # sign AAX
 if [ -n "${AAXSIGNCMD}" ]; then
   echo "Signing AAX plugin"
-  ${AAXSIGNCMD} --keypassword "${CERTPASS}"  --in ${BASENAME}'\Plugins\'${BASENAME}.aaxplugin --out ${BASENAME}'\Plugins\'${BASENAME}.aaxplugin
+  ${AAXSIGNCMD} --keypassword "${CERTPASS}"  --in ${BASENAME}'\Plugins\AAX\'${BASENAME}.aaxplugin --out ${BASENAME}'\Plugins\AAX\'${BASENAME}.aaxplugin
 fi
 
 
diff --git a/release/wininstaller.iss b/release/wininstaller.iss
index 95495bc..b37ff03 100644
--- a/release/wininstaller.iss
+++ b/release/wininstaller.iss
@@ -42,8 +42,8 @@ Name: "aax_64"; Description: "64-bit AAX Plugin (.aaxplugin)"; Types: full custo
 [Files]
 Source: "PaulXStretch\PaulXStretch.exe";  DestDir: "{app}" ; Check: Is64BitInstallMode; Components:app; Flags: ignoreversion signonce;
 ;Source: "SonoBus\Plugins\PaulXStretch.dll"; DestDir: {code:GetVST2Dir|0}; Check: Is64BitInstallMode; Components:vst2_64; Flags: ignoreversion signonce;
-Source: "PaulXStretch\Plugins\PaulXStretch.vst3"; DestDir: "{commoncf64}\VST3\"; Check: Is64BitInstallMode; Components:vst3_64; Flags: ignoreversion recursesubdirs createallsubdirs ;
-Source: "PaulXStretch\Plugins\PaulXStretch.aaxplugin"; DestDir: "{commoncf64}\Avid\Audio\Plug-Ins\"; Check: Is64BitInstallMode; Components:aax_64; Flags: ignoreversion recursesubdirs createallsubdirs ;
+Source: "PaulXStretch\Plugins\VST3\PaulXStretch.vst3"; DestDir: "{commoncf64}\VST3\"; Check: Is64BitInstallMode; Components:vst3_64; Flags: ignoreversion recursesubdirs createallsubdirs ;
+Source: "PaulXStretch\Plugins\AAX\PaulXStretch.aaxplugin"; DestDir: "{commoncf64}\Avid\Audio\Plug-Ins\"; Check: Is64BitInstallMode; Components:aax_64; Flags: ignoreversion recursesubdirs createallsubdirs ;
 
 ;Source: "SonoBus\SonoBus32.exe"; DestDir: "{app}" ;  DestName:"SonoBus.exe"; Check: not Is64BitInstallMode;  Components:app32; Flags: ignoreversion signonce;
 ;Source: "SonoBus\Plugins32\SonoBus.dll"; DestDir: {code:GetVST2Dir|1}; Components:vst2_32; Flags: ignoreversion signonce;