From 1a5b18290909f6f1471d3d2b39cdcc500a9134f6 Mon Sep 17 00:00:00 2001
From: Elliot Jordan <homebysix@users.noreply.github.com>
Date: Tue, 16 Jan 2024 12:56:40 -0800
Subject: [PATCH] Adjust Ezeep recipes to use Ezeep Print App version

---
 ezeep/ezeepBluePrintApp.download.recipe | 39 ++++++++++++++++++++++++-
 ezeep/ezeepBluePrintApp.munki.recipe    | 28 ++++++++++++++++++
 ezeep/ezeepBluePrintApp.pkg.recipe      |  2 +-
 3 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/ezeep/ezeepBluePrintApp.download.recipe b/ezeep/ezeepBluePrintApp.download.recipe
index 08f33737..d4741633 100644
--- a/ezeep/ezeepBluePrintApp.download.recipe
+++ b/ezeep/ezeepBluePrintApp.download.recipe
@@ -52,7 +52,7 @@ For the older "ezeep Desktop" app, use the ezeepDesktop recipes.</string>
 			<key>Arguments</key>
 			<dict>
 				<key>pattern</key>
-				<string>%RECIPE_CACHE_DIR%/%NAME%/ezeep Print App macOS */*.pkg</string>
+				<string>%RECIPE_CACHE_DIR%/%NAME%/ezeep Blue Print App Mac */ezeep Print App.pkg</string>
 			</dict>
 			<key>Processor</key>
 			<string>FileFinder</string>
@@ -72,6 +72,43 @@ For the older "ezeep Desktop" app, use the ezeepDesktop recipes.</string>
 			<key>Processor</key>
 			<string>CodeSignatureVerifier</string>
 		</dict>
+		<dict>
+			<key>Arguments</key>
+			<dict>
+				<key>destination_path</key>
+				<string>%RECIPE_CACHE_DIR%/unpack</string>
+				<key>flat_pkg_path</key>
+				<string>%found_filename%</string>
+				<key>purge_destination</key>
+				<true/>
+			</dict>
+			<key>Processor</key>
+			<string>FlatPkgUnpacker</string>
+		</dict>
+		<dict>
+			<key>Arguments</key>
+			<dict>
+				<key>destination_path</key>
+				<string>%RECIPE_CACHE_DIR%/payload</string>
+				<key>pkg_payload_path</key>
+				<string>%RECIPE_CACHE_DIR%/unpack/ezeep Print App Component.pkg/Payload</string>
+				<key>purge_destination</key>
+				<true/>
+			</dict>
+			<key>Processor</key>
+			<string>PkgPayloadUnpacker</string>
+		</dict>
+		<dict>
+			<key>Arguments</key>
+			<dict>
+				<key>input_plist_path</key>
+				<string>%RECIPE_CACHE_DIR%/payload/Applications/ezeep Print App/ezeep Print App.app/Contents/Info.plist</string>
+				<key>plist_version_key</key>
+				<string>CFBundleShortVersionString</string>
+			</dict>
+			<key>Processor</key>
+			<string>Versioner</string>
+		</dict>
 	</array>
 </dict>
 </plist>
diff --git a/ezeep/ezeepBluePrintApp.munki.recipe b/ezeep/ezeepBluePrintApp.munki.recipe
index 1128e3df..eb2c456d 100644
--- a/ezeep/ezeepBluePrintApp.munki.recipe
+++ b/ezeep/ezeepBluePrintApp.munki.recipe
@@ -17,6 +17,13 @@ For the older "ezeep Desktop" app, use the ezeepDesktop recipes.</string>
 		<string>apps/%NAME%</string>
 		<key>NAME</key>
 		<string>ezeep Print App</string>
+		<key>pkg_ids_set_optional_true</key>
+		<array>
+			<string>com.thinprint.ezeep.printapp.logging</string>
+			<string>com.thinprint.ezeep.printapp.printerdriver</string>
+			<string>com.ThinPrint.TPAutoConnect.PPDGen</string>
+			<string>com.ThinPrint.TPAutoConnect</string>
+		</array>
 		<key>pkginfo</key>
 		<dict>
 			<key>blocking_applications</key>
@@ -46,6 +53,18 @@ For the older "ezeep Desktop" app, use the ezeepDesktop recipes.</string>
 	<string>com.github.homebysix.download.ezeepBluePrintApp</string>
 	<key>Process</key>
 	<array>
+		<dict>
+			<key>Arguments</key>
+			<dict>
+				<key>additional_pkginfo</key>
+				<dict>
+					<key>version</key>
+					<string>%version%</string>
+				</dict>
+			</dict>
+			<key>Processor</key>
+			<string>MunkiPkginfoMerger</string>
+		</dict>
 		<dict>
 			<key>Arguments</key>
 			<dict>
@@ -57,6 +76,15 @@ For the older "ezeep Desktop" app, use the ezeepDesktop recipes.</string>
 			<key>Processor</key>
 			<string>MunkiImporter</string>
 		</dict>
+		<dict>
+			<key>Arguments</key>
+			<dict>
+				<key>pkginfo_repo_path</key>
+				<string>%pkginfo_repo_path%</string>
+			</dict>
+			<key>Processor</key>
+			<string>MunkiOptionalReceiptEditor</string>
+		</dict>
 	</array>
 </dict>
 </plist>
diff --git a/ezeep/ezeepBluePrintApp.pkg.recipe b/ezeep/ezeepBluePrintApp.pkg.recipe
index 8175957f..59d5a8bd 100644
--- a/ezeep/ezeepBluePrintApp.pkg.recipe
+++ b/ezeep/ezeepBluePrintApp.pkg.recipe
@@ -26,7 +26,7 @@ For the older "ezeep Desktop" app, use the ezeepDesktop recipes.</string>
 			<key>Arguments</key>
 			<dict>
 				<key>pkg_path</key>
-				<string>%RECIPE_CACHE_DIR%/%NAME%.pkg</string>
+				<string>%RECIPE_CACHE_DIR%/%NAME%-%version%.pkg</string>
 				<key>source_pkg</key>
 				<string>%found_filename%</string>
 			</dict>