diff --git a/DuetDisplay/duet.download.recipe b/DuetDisplay/duet.download.recipe
index 30a23939..a4093e01 100644
--- a/DuetDisplay/duet.download.recipe
+++ b/DuetDisplay/duet.download.recipe
@@ -5,19 +5,13 @@
Comment
Created with Recipe Robot v1.0.3 (https://github.com/homebysix/recipe-robot)
Description
- 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"
+ Downloads the latest version of duet.
Identifier
com.github.homebysix.download.duet
Input
NAME
duet
- DOWNLOAD_VERSION
- AppleSilicon
MinimumVersion
0.6.1
@@ -27,9 +21,9 @@ To download the latest legacy version of duet (macOS 10.9 - 12.2) set DOWNLOAD_V
Arguments
filename
- %NAME%.zip
+ %NAME%.dmg
url
- https://updates.duetdisplay.com/%DOWNLOAD_VERSION%
+ https://updates.duetdisplay.com/AppleSilicon
Processor
URLDownloader
@@ -38,24 +32,11 @@ To download the latest legacy version of duet (macOS 10.9 - 12.2) set DOWNLOAD_V
Processor
EndOfCheckPhase
-
- Arguments
-
- archive_path
- %pathname%
- destination_path
- %RECIPE_CACHE_DIR%/%NAME%/Applications
- purge_destination
-
-
- Processor
- Unarchiver
-
Arguments
input_path
- %RECIPE_CACHE_DIR%/%NAME%/Applications/duet.app
+ %pathname%/duet.app
requirement
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)
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 @@
Arguments
dmg_path
- %RECIPE_CACHE_DIR%/%NAME%.dmg
- dmg_root
- %RECIPE_CACHE_DIR%/%NAME%/Applications
-
- Processor
- DmgCreator
-
-
- Arguments
-
- dmg_path
- %dmg_path%
+ %pathname%
items_to_copy
diff --git a/DuetDisplay/duet.munki.recipe b/DuetDisplay/duet.munki.recipe
index 0bdfd496..bc2698ae 100644
--- a/DuetDisplay/duet.munki.recipe
+++ b/DuetDisplay/duet.munki.recipe
@@ -5,9 +5,7 @@
Comment
Created with Recipe Robot v1.0.3 (https://github.com/homebysix/recipe-robot)
Description
- 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.
+ Downloads the latest version of duet and imports it into Munki.
Identifier
com.github.homebysix.munki.duet
Input
@@ -42,22 +40,11 @@ If downloading the latest legacy version of duet (macOS 10.9 - 12.2) set maximum
com.github.homebysix.download.duet
Process
-
- Arguments
-
- dmg_path
- %RECIPE_CACHE_DIR%/%NAME%.dmg
- dmg_root
- %RECIPE_CACHE_DIR%/%NAME%/Applications
-
- Processor
- DmgCreator
-
Arguments
pkg_path
- %dmg_path%
+ %pathname%
repo_subdirectory
%MUNKI_REPO_SUBDIR%
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 @@
com.github.homebysix.download.duet
Process
+
+ Arguments
+
+ destination_path
+ %RECIPE_CACHE_DIR%/%NAME%/Applications/duet.app
+ source_path
+ %pathname%/duet.app
+
+ Processor
+ Copier
+
+
+ Arguments
+
+ info_path
+ %RECIPE_CACHE_DIR%/%NAME%/Applications/duet.app
+ plist_keys
+
+ CFBundleShortVersionString
+ version
+
+
+ Processor
+ PlistReader
+
Arguments
@@ -52,6 +77,17 @@
Processor
PkgCreator
+
+ Arguments
+
+ path_list
+
+ %RECIPE_CACHE_DIR%/%NAME%
+
+
+ Processor
+ PathDeleter
+