From 12faea0a71696879217d444e24e57bbd5f86b940 Mon Sep 17 00:00:00 2001
From: Paul Cossey <paul_cossey@hotmail.com>
Date: Mon, 4 Nov 2024 19:45:38 +0000
Subject: [PATCH] Removes support for the legacy version of DuetDesktop

Removes support for the legacy version of DuetDesktop as per https://github.com/autopkg/homebysix-recipes/issues/661

Updates the pkg and install recipe to account for the new dmg format.
---
 DuetDisplay/duet.download.recipe | 10 ++-------
 DuetDisplay/duet.install.recipe  | 13 +-----------
 DuetDisplay/duet.munki.recipe    |  4 +---
 DuetDisplay/duet.pkg.recipe      | 36 ++++++++++++++++++++++++++++++++
 4 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/DuetDisplay/duet.download.recipe b/DuetDisplay/duet.download.recipe
index fde43b0d..a4093e01 100644
--- a/DuetDisplay/duet.download.recipe
+++ b/DuetDisplay/duet.download.recipe
@@ -5,19 +5,13 @@
 	<key>Comment</key>
 	<string>Created with Recipe Robot v1.0.3 (https://github.com/homebysix/recipe-robot)</string>
 	<key>Description</key>
-	<string>Downloads the latest version of duet.
-
-To download the latest version of duet (macOS 12.3 and above) set DOWNLOAD_VERSION to "AppleSilicon" - Please note the "AppleSilicon" version is Universal.
-
-To download the latest legacy version of duet (macOS 10.9 - 12.2) set DOWNLOAD_VERSION to "legacyMac"</string>
+	<string>Downloads the latest version of duet.</string>
 	<key>Identifier</key>
 	<string>com.github.homebysix.download.duet</string>
 	<key>Input</key>
 	<dict>
 		<key>NAME</key>
 		<string>duet</string>
-		<key>DOWNLOAD_VERSION</key>
-		<string>AppleSilicon</string>
 	</dict>
 	<key>MinimumVersion</key>
 	<string>0.6.1</string>
@@ -29,7 +23,7 @@ To download the latest legacy version of duet (macOS 10.9 - 12.2) set DOWNLOAD_V
 				<key>filename</key>
 				<string>%NAME%.dmg</string>
 				<key>url</key>
-				<string>https://updates.duetdisplay.com/%DOWNLOAD_VERSION%</string>
+				<string>https://updates.duetdisplay.com/AppleSilicon</string>
 			</dict>
 			<key>Processor</key>
 			<string>URLDownloader</string>
diff --git a/DuetDisplay/duet.install.recipe b/DuetDisplay/duet.install.recipe
index 7fdfd22e..a4d60b9e 100644
--- a/DuetDisplay/duet.install.recipe
+++ b/DuetDisplay/duet.install.recipe
@@ -23,18 +23,7 @@
 			<key>Arguments</key>
 			<dict>
 				<key>dmg_path</key>
-				<string>%RECIPE_CACHE_DIR%/%NAME%.dmg</string>
-				<key>dmg_root</key>
-				<string>%RECIPE_CACHE_DIR%/%NAME%/Applications</string>
-			</dict>
-			<key>Processor</key>
-			<string>DmgCreator</string>
-		</dict>
-		<dict>
-			<key>Arguments</key>
-			<dict>
-				<key>dmg_path</key>
-				<string>%dmg_path%</string>
+				<string>%pathname%</string>
 				<key>items_to_copy</key>
 				<array>
 					<dict>
diff --git a/DuetDisplay/duet.munki.recipe b/DuetDisplay/duet.munki.recipe
index fc3df40f..bc2698ae 100644
--- a/DuetDisplay/duet.munki.recipe
+++ b/DuetDisplay/duet.munki.recipe
@@ -5,9 +5,7 @@
 	<key>Comment</key>
 	<string>Created with Recipe Robot v1.0.3 (https://github.com/homebysix/recipe-robot)</string>
 	<key>Description</key>
-	<string>Downloads the latest version of duet and imports it into Munki.
-
-If downloading the latest legacy version of duet (macOS 10.9 - 12.2) set maximum_os_version to 12.2 otherwise please leave blank.</string>
+	<string>Downloads the latest version of duet and imports it into Munki.</string>
 	<key>Identifier</key>
 	<string>com.github.homebysix.munki.duet</string>
 	<key>Input</key>
diff --git a/DuetDisplay/duet.pkg.recipe b/DuetDisplay/duet.pkg.recipe
index 7f63f3e2..87795814 100644
--- a/DuetDisplay/duet.pkg.recipe
+++ b/DuetDisplay/duet.pkg.recipe
@@ -21,6 +21,31 @@
 	<string>com.github.homebysix.download.duet</string>
 	<key>Process</key>
 	<array>
+		<dict>
+			<key>Arguments</key>
+			<dict>
+				<key>destination_path</key>
+				<string>%RECIPE_CACHE_DIR%/%NAME%/Applications/duet.app</string>
+				<key>source_path</key>
+				<string>%pathname%/duet.app</string>
+			</dict>
+			<key>Processor</key>
+			<string>Copier</string>
+		</dict>
+		<dict>
+			<key>Arguments</key>
+			<dict>
+				<key>info_path</key>
+				<string>%RECIPE_CACHE_DIR%/%NAME%/Applications/duet.app</string>
+				<key>plist_keys</key>
+				<dict>
+					<key>CFBundleShortVersionString</key>
+					<string>version</string>
+				</dict>
+			</dict>
+			<key>Processor</key>
+			<string>PlistReader</string>
+		</dict>
 		<dict>
 			<key>Arguments</key>
 			<dict>
@@ -52,6 +77,17 @@
 			<key>Processor</key>
 			<string>PkgCreator</string>
 		</dict>
+		<dict>
+			<key>Arguments</key>
+			<dict>
+				<key>path_list</key>
+				<array>
+					<string>%RECIPE_CACHE_DIR%/%NAME%</string>
+				</array>
+			</dict>
+			<key>Processor</key>
+			<string>PathDeleter</string>
+		</dict>
 	</array>
 </dict>
 </plist>