From 10215059720b5ac3eef6132d0927fe0660898a44 Mon Sep 17 00:00:00 2001 From: Paul Cossey Date: Mon, 4 Nov 2024 13:08:17 +0000 Subject: [PATCH 1/2] Duet Display - Updated Downloaded File Format Updated for dmg file format --- DuetDisplay/duet.download.recipe | 17 ++--------------- DuetDisplay/duet.munki.recipe | 13 +------------ 2 files changed, 3 insertions(+), 27 deletions(-) diff --git a/DuetDisplay/duet.download.recipe b/DuetDisplay/duet.download.recipe index 30a23939..fde43b0d 100644 --- a/DuetDisplay/duet.download.recipe +++ b/DuetDisplay/duet.download.recipe @@ -27,7 +27,7 @@ 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% @@ -38,24 +38,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.munki.recipe b/DuetDisplay/duet.munki.recipe index 0bdfd496..fc3df40f 100644 --- a/DuetDisplay/duet.munki.recipe +++ b/DuetDisplay/duet.munki.recipe @@ -42,22 +42,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% From 12faea0a71696879217d444e24e57bbd5f86b940 Mon Sep 17 00:00:00 2001 From: Paul Cossey Date: Mon, 4 Nov 2024 19:45:38 +0000 Subject: [PATCH 2/2] 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 @@ 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 @@ -29,7 +23,7 @@ To download the latest legacy version of duet (macOS 10.9 - 12.2) set DOWNLOAD_V filename %NAME%.dmg url - https://updates.duetdisplay.com/%DOWNLOAD_VERSION% + https://updates.duetdisplay.com/AppleSilicon Processor URLDownloader 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 fc3df40f..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 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 +