macOS Catalina compatible np script

alexreg · Dec 31, 2019 · ffabb2e · ffabb2e
1 parent 0775e9f
commit ffabb2e
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 24 deletions.
diff --git a/Sources/App/Resources/Scripting/Script Files/Textual Extras Installer/Create-Installers b/Sources/App/Resources/Scripting/Script Files/Textual Extras Installer/Create-Installers
@@ -16,31 +16,17 @@ export PACKAGES_DESTINATION="./Packages"
 
 echo "**************************"
 
-./Installer\ Helpers/Build-Scripts-Package "AudioVideo" \
-"hermes" \
-"music" \
-"np" \
-"qt" \
-"radium" \
-"spotify" \
-"vlc"
+./Installer\ Helpers/Build-Scripts-Package "AudioVideo" "hermes,music,qt,radium,spotify,vlc"
+./Installer\ Helpers/Build-Scripts-Package "AudioVideo-np-iTunes" "np" "np/iTunes/"
+./Installer\ Helpers/Build-Scripts-Package "AudioVideo-np-Music" "np" "np/Music/"
 
 echo "**************************"
 
-./Installer\ Helpers/Build-Scripts-Package "Fun" \
-"banhammer" \
-"ffuu" \
-"o_o" \
-"slap"
+./Installer\ Helpers/Build-Scripts-Package "Fun" "banhammer,ffuu,o_o,slap"
 
 echo "**************************"
 
-./Installer\ Helpers/Build-Scripts-Package "Utilities" \
-"apps" \
-"flip" \
-"page" \
-"reverse" \
-"shell"
+./Installer\ Helpers/Build-Scripts-Package "Utilities" "apps,flip,page,reverse,shell"
 
 echo "**************************"
 

diff --git a/...ources/Scripting/Script Files/Textual Extras Installer/Installation Files/Scripts/np.scpt b/...ources/Scripting/Script Files/Textual Extras Installer/Installation Files/Scripts/np.scpt
diff --git a/...ripting/Script Files/Textual Extras Installer/Installation Files/Scripts/np/Music/np.scpt b/...ripting/Script Files/Textual Extras Installer/Installation Files/Scripts/np/Music/np.scpt
diff --git a/...ipting/Script Files/Textual Extras Installer/Installation Files/Scripts/np/iTunes/np.scpt b/...ipting/Script Files/Textual Extras Installer/Installation Files/Scripts/np/iTunes/np.scpt
diff --git a/...s/Scripting/Script Files/Textual Extras Installer/Installer Helpers/Build-Scripts-Package b/...s/Scripting/Script Files/Textual Extras Installer/Installer Helpers/Build-Scripts-Package
@@ -7,11 +7,11 @@ echo "${1} - Start";
 
 mkdir -p "${BUILD_PATH_SCRIPTS_STANDALONE}"
 
-for i in ${@:2}
+for i in $(echo $2 | sed "s/,/ /g")
 do
 	echo "Copying ${i}"
 
-	cp "${SOURCE_FILES_SCRIPTS}/${i}.scpt" "${BUILD_PATH_SCRIPTS_STANDALONE}"
+	cp "${SOURCE_FILES_SCRIPTS}/${3}${i}.scpt" "${BUILD_PATH_SCRIPTS_STANDALONE}"
 done
 
 pkgbuild \
@@ -31,9 +31,9 @@ rm -fr "${BUILD_PATH}"
 
 mkdir -p "${BUILD_PATH_SCRIPTS_MACAPPSTORE}"
 
-for i in ${@:2}
+for i in $(echo $2 | sed "s/,/ /g")
 do
-	cp "${SOURCE_FILES_SCRIPTS}/${i}.scpt" "${BUILD_PATH_SCRIPTS_MACAPPSTORE}"
+	cp "${SOURCE_FILES_SCRIPTS}/${3}${i}.scpt" "${BUILD_PATH_SCRIPTS_MACAPPSTORE}"
 done
 
 pkgbuild \

diff --git a/...Resources/Scripting/Script Files/Textual Extras Installer/Packages/Textual-Extras-MAS.pkg b/...Resources/Scripting/Script Files/Textual Extras Installer/Packages/Textual-Extras-MAS.pkg
diff --git a/...App/Resources/Scripting/Script Files/Textual Extras Installer/Packages/Textual-Extras.pkg b/...App/Resources/Scripting/Script Files/Textual Extras Installer/Packages/Textual-Extras.pkg
diff --git a/Sources/App/Resources/Scripting/Script Files/Textual Extras Installer/distribution.plist b/Sources/App/Resources/Scripting/Script Files/Textual Extras Installer/distribution.plist
@@ -13,6 +13,21 @@
             <os-version min="10.8"/>
         </allowed-os-versions>
     </volume-check>
+
+    <!-- These functions could be simplified but I prefer less ambiguity. -->
+    <script>
+	<![CDATA[
+		    
+		function script_np_itunes_enabled() {
+			return system.compareVersions(system.version.ProductVersion, '10.15') < 0;
+		}
+			
+		function script_np_music_enabled() {
+			return system.compareVersions(system.version.ProductVersion, '10.15') >= 0;
+		}
+
+	]]>
+	</script>
 
     <choices-outline>
         <line choice="installer_choice_1">
@@ -36,6 +51,8 @@
 
     <choice id="installer_choice_1_1" start_selected="false" title="INSTALLER_CHOICE_1_1_TITLE" description="INSTALLER_CHOICE_1_1_DESCRIPTION">
         <pkg-ref id="com.codeux.app-extensions.textual-scripts-installer-AudioVideo"/>
+        <pkg-ref id="com.codeux.app-extensions.textual-scripts-installer-AudioVideo-np-iTunes"/>
+        <pkg-ref id="com.codeux.app-extensions.textual-scripts-installer-AudioVideo-np-Music"/>
     </choice>
     <choice id="installer_choice_1_2" start_selected="false" title="INSTALLER_CHOICE_1_2_TITLE" description="INSTALLER_CHOICE_1_2_DESCRIPTION">
         <pkg-ref id="com.codeux.app-extensions.textual-scripts-installer-Fun"/>
@@ -66,7 +83,9 @@
     <choice id="installer_choice_3" start_visible="false" start_enabled="false" title="INSTALLER_CHOICE_3_TITLE" description=""/>
  -->
 
-    <pkg-ref id="com.codeux.app-extensions.textual-scripts-installer-AudioVideo" version="1.3">#Scripts-AudioVideo.pkg</pkg-ref>
+    <pkg-ref id="com.codeux.app-extensions.textual-scripts-installer-AudioVideo" version="1.4">#Scripts-AudioVideo.pkg</pkg-ref>
+    <pkg-ref id="com.codeux.app-extensions.textual-scripts-installer-AudioVideo-np-iTunes" version="1.0" active="script_np_itunes_enabled()">#Scripts-AudioVideo-np-iTunes.pkg</pkg-ref>
+    <pkg-ref id="com.codeux.app-extensions.textual-scripts-installer-AudioVideo-np-Music" version="1.0" active="script_np_music_enabled()">#Scripts-AudioVideo-np-Music.pkg</pkg-ref>
     <pkg-ref id="com.codeux.app-extensions.textual-scripts-installer-Fun" version="1.3">#Scripts-Fun.pkg</pkg-ref>
     <pkg-ref id="com.codeux.app-extensions.textual-scripts-installer-Utilities" version="1.3">#Scripts-Utilities.pkg</pkg-ref>
     <pkg-ref id="com.codeux.app-extensions.textual-extension-installer-BlowfishEncryption" version="1.0.9">#Extension-BlowfishEncryption.pkg</pkg-ref>