From 01205b3ec78b679dd18b27c04f0461c2b98ca00e Mon Sep 17 00:00:00 2001
From: Yan Pujante <ypujante@gmail.com>
Date: Sun, 19 May 2019 11:19:52 -0700
Subject: [PATCH] fixed jamba.sh

---
 README.md                  |  3 +++
 jamba.cmake                |  2 +-
 scripts/jamba_multi.sh.in  | 29 +++++++++++++++++++----------
 scripts/jamba_single.sh.in |  8 ++++----
 4 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 7a9fbe5..49c4863 100644
--- a/README.md
+++ b/README.md
@@ -214,6 +214,9 @@ Documentation
 
 Release Notes
 -------------
+### 2019-05-19 - `v3.2.1`
+* fixed `jamba.sh` script to handle filename with white spaces and install audio unit before validation (validation tool unfortunately works from an installed component, not a file...)
+
 ### 2019-05-19 - `v3.2.0`
 * added audio unit validation to `jamba.sh` script (`jamba.sh validate-au`) which runs the `auvaltool` utility on the audio unit plugin
 * added switch container view to handle tab like switching (check `Views::SwitchContainerView`)
diff --git a/jamba.cmake b/jamba.cmake
index 8682538..008daa6 100644
--- a/jamba.cmake
+++ b/jamba.cmake
@@ -6,7 +6,7 @@ set(JAMBA_ROOT ${CMAKE_CURRENT_LIST_DIR})
 #-------------------------------------------------------------------------------
 set(JAMBA_MAJOR_VERSION 3)
 set(JAMBA_MINOR_VERSION 2)
-set(JAMBA_PATCH_VERSION 0)
+set(JAMBA_PATCH_VERSION 1)
 execute_process(COMMAND git describe --long --dirty --abbrev=10 --tags
     RESULT_VARIABLE result
     OUTPUT_VARIABLE JAMBA_GIT_VERSION
diff --git a/scripts/jamba_multi.sh.in b/scripts/jamba_multi.sh.in
index c6592b5..3b7cb04 100755
--- a/scripts/jamba_multi.sh.in
+++ b/scripts/jamba_multi.sh.in
@@ -119,13 +119,22 @@ validate()
 validate_au()
 {
   if [ "${JAMBA_ENABLE_AUDIO_UNIT}" == "ON" ]; then
-    build_au
+    install_au
 
     AU_BUILD_COMPONENT="VST3/${BUILD_CONFIG}/${BUILD_TARGET}_au.component"
     AU_PLIST_FILE="$AU_BUILD_COMPONENT/Contents/Info.plist"
-    AU_TYPE=`/usr/libexec/PlistBuddy -c "Print :AudioComponents:0:type" "${AU_PLIST_FILE}"`
-    AU_SUBTYPE=`/usr/libexec/PlistBuddy -c "Print :AudioComponents:0:subtype" "${AU_PLIST_FILE}"`
-    AU_MANUFACTURER=`/usr/libexec/PlistBuddy -c "Print :AudioComponents:0:manufacturer" "${AU_PLIST_FILE}"`
+    if [ -z "$DRY_RUN" ]; then
+      AU_TYPE=`/usr/libexec/PlistBuddy -c "Print :AudioComponents:0:type" "${AU_PLIST_FILE}"`
+      AU_SUBTYPE=`/usr/libexec/PlistBuddy -c "Print :AudioComponents:0:subtype" "${AU_PLIST_FILE}"`
+      AU_MANUFACTURER=`/usr/libexec/PlistBuddy -c "Print :AudioComponents:0:manufacturer" "${AU_PLIST_FILE}"`
+    else
+      ${DRY_RUN} AU_TYPE=/usr/libexec/PlistBuddy -c "Print :AudioComponents:0:type" "${AU_PLIST_FILE}"
+      ${DRY_RUN} AU_SUBTYPE=/usr/libexec/PlistBuddy -c "Print :AudioComponents:0:subtype" "${AU_PLIST_FILE}"
+      ${DRY_RUN} AU_MANUFACTURER=/usr/libexec/PlistBuddy -c "Print :AudioComponents:0:manufacturer" "${AU_PLIST_FILE}"
+      AU_TYPE="<computed AU_TYE>"
+      AU_SUBTYPE="<computed AU_SUBTYPE>"
+      AU_MANUFACTURER="<computed AU_MANUFACTURER>"
+    fi
     ${DRY_RUN} /usr/bin/auvaltool -v $AU_TYPE $AU_SUBTYPE $AU_MANUFACTURER
   fi
 }
@@ -151,13 +160,13 @@ install()
   if [ "${BUILD_CONFIG}" == "Release" ]; then
     FILENAME=${RELEASE_FILENAME}
   fi
-  ${DRY_RUN} rm -rf ~/Library/Audio/Plug-Ins/VST3/${FILENAME}.vst3
-  ${DRY_RUN} cp -r VST3/${BUILD_CONFIG}/${BUILD_TARGET}.vst3  ~/Library/Audio/Plug-Ins/VST3/${FILENAME}.vst3
+  ${DRY_RUN} rm -rf "$HOME/Library/Audio/Plug-Ins/VST3/${FILENAME}.vst3"
+  ${DRY_RUN} cp -r "VST3/${BUILD_CONFIG}/${BUILD_TARGET}.vst3"  "$HOME/Library/Audio/Plug-Ins/VST3/${FILENAME}.vst3"
   echo "VST3 plugin installed under ~/Library/Audio/Plug-Ins/VST3/${FILENAME}.vst3"
 
   if [ "${JAMBA_ENABLE_VST2}" == "ON" ]; then
-    ${DRY_RUN} rm -rf ~/Library/Audio/Plug-Ins/VST/${FILENAME}.vst
-    ${DRY_RUN} cp -r VST3/${BUILD_CONFIG}/${BUILD_TARGET}.vst3  ~/Library/Audio/Plug-Ins/VST/${FILENAME}.vst
+    ${DRY_RUN} rm -rf "$HOME/Library/Audio/Plug-Ins/VST/${FILENAME}.vst"
+    ${DRY_RUN} cp -r "VST3/${BUILD_CONFIG}/${BUILD_TARGET}.vst3" "$HOME/Library/Audio/Plug-Ins/VST/${FILENAME}.vst"
     echo "VST2 plugin installed under ~/Library/Audio/Plug-Ins/VST/${FILENAME}.vst"
   fi
 }
@@ -174,8 +183,8 @@ install_au()
     if [ "${BUILD_CONFIG}" == "Release" ]; then
       FILENAME=${RELEASE_FILENAME}
     fi
-    ${DRY_RUN} rm -rf ~/Library/Audio/Plug-Ins/Components/${FILENAME}.component
-    ${DRY_RUN} cp -r VST3/${BUILD_CONFIG}/${BUILD_TARGET}_au.component  ~/Library/Audio/Plug-Ins/Components/${FILENAME}.component
+    ${DRY_RUN} rm -rf "$HOME/Library/Audio/Plug-Ins/Components/${FILENAME}.component"
+    ${DRY_RUN} cp -r "VST3/${BUILD_CONFIG}/${BUILD_TARGET}_au.component" "$HOME/Library/Audio/Plug-Ins/Components/${FILENAME}.component"
     echo "Audio Unit plugin installed under ~/Library/Audio/Plug-Ins/Components/${FILENAME}.component"
   fi
 }
diff --git a/scripts/jamba_single.sh.in b/scripts/jamba_single.sh.in
index 6e0367a..4fab78e 100755
--- a/scripts/jamba_single.sh.in
+++ b/scripts/jamba_single.sh.in
@@ -118,13 +118,13 @@ install()
   if [ "${BUILD_CONFIG}" == "Release" ]; then
     FILENAME=${RELEASE_FILENAME}
   fi
-  ${DRY_RUN} rm -rf ~/Library/Audio/Plug-Ins/VST3/${FILENAME}.vst3
-  ${DRY_RUN} cp -r VST3/${BUILD_TARGET}.vst3  ~/Library/Audio/Plug-Ins/VST3/${FILENAME}.vst3
+  ${DRY_RUN} rm -rf "$HOME/Library/Audio/Plug-Ins/VST3/${FILENAME}.vst3"
+  ${DRY_RUN} cp -r "VST3/${BUILD_TARGET}.vst3"  "$HOME/Library/Audio/Plug-Ins/VST3/${FILENAME}.vst3"
   echo "VST3 plugin installed under ~/Library/Audio/Plug-Ins/VST3/${FILENAME}.vst3"
 
   if [ "${JAMBA_ENABLE_VST2}" == "ON" ]; then
-    ${DRY_RUN} rm -rf ~/Library/Audio/Plug-Ins/VST/${FILENAME}.vst
-    ${DRY_RUN} cp -r VST3/${BUILD_TARGET}.vst3  ~/Library/Audio/Plug-Ins/VST/${FILENAME}.vst
+    ${DRY_RUN} rm -rf "$HOME/Library/Audio/Plug-Ins/VST/${FILENAME}.vst"
+    ${DRY_RUN} cp -r "VST3/${BUILD_TARGET}.vst3"  "$HOME/Library/Audio/Plug-Ins/VST/${FILENAME}.vst"
     echo "VST2 plugin installed under ~/Library/Audio/Plug-Ins/VST/${FILENAME}.vst"
   fi
 }