Merge pull request #662 from paul-cossey/DuetDisplay

Duet display
autopkg · Nov 10, 2024 · 64e97ce · 64e97ce
2 parents 12df3ac + 12faea0
commit 64e97ce
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 50 deletions.
diff --git 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>
@@ -27,9 +21,9 @@ To download the latest legacy version of duet (macOS 10.9 - 12.2) set DOWNLOAD_V
 			<key>Arguments</key>
 			<dict>
 				<key>filename</key>
-				<string>%NAME%.zip</string>
+				<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>
@@ -38,24 +32,11 @@ To download the latest legacy version of duet (macOS 10.9 - 12.2) set DOWNLOAD_V
 			<key>Processor</key>
 			<string>EndOfCheckPhase</string>
 		</dict>
-		<dict>
-			<key>Arguments</key>
-			<dict>
-				<key>archive_path</key>
-				<string>%pathname%</string>
-				<key>destination_path</key>
-				<string>%RECIPE_CACHE_DIR%/%NAME%/Applications</string>
-				<key>purge_destination</key>
-				<true/>
-			</dict>
-			<key>Processor</key>
-			<string>Unarchiver</string>
-		</dict>
 		<dict>
 			<key>Arguments</key>
 			<dict>
 				<key>input_path</key>
-				<string>%RECIPE_CACHE_DIR%/%NAME%/Applications/duet.app</string>
+				<string>%pathname%/duet.app</string>
 				<key>requirement</key>
 				<string>anchor apple generic and identifier "com.kairos.duetMac" and (certificate leaf[field.1.2.840.113635.100.6.1.9] /* exists */ or certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = J6L96W8A86)</string>
 			</dict>

diff --git 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
@@ -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>
@@ -42,22 +40,11 @@ If downloading the latest legacy version of duet (macOS 10.9 - 12.2) set maximum
 	<string>com.github.homebysix.download.duet</string>
 	<key>Process</key>
 	<array>
-		<dict>
-			<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>pkg_path</key>
-				<string>%dmg_path%</string>
+				<string>%pathname%</string>
 				<key>repo_subdirectory</key>
 				<string>%MUNKI_REPO_SUBDIR%</string>
 			</dict>

diff --git 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>