From 48ab7f7127f46542a816aa14418fa44178f5b907 Mon Sep 17 00:00:00 2001 From: Paul Cossey Date: Fri, 5 Jan 2024 16:30:43 +0000 Subject: [PATCH 1/3] Update BlueJ Download - Updated regex to search for the DMG file - Deletion of Unarchiver and FileFinder steps - Updated path for Code Signature - Update path for Versioner Munki - Removal of FileFinder and DmgCreator steps - Updated pkg_path --- BlueJ/BlueJ.download.recipe | 28 +++------------------------- BlueJ/BlueJ.munki.recipe | 22 +--------------------- 2 files changed, 4 insertions(+), 46 deletions(-) diff --git a/BlueJ/BlueJ.download.recipe b/BlueJ/BlueJ.download.recipe index dd23e3469..56bea658a 100644 --- a/BlueJ/BlueJ.download.recipe +++ b/BlueJ/BlueJ.download.recipe @@ -27,7 +27,7 @@ url %DOWNLOAD_URL% re_pattern - <a href="download/files/(BlueJ-mac-\d+[a-z]?\.zip)"> + <a href="download/files/(BlueJ-mac-\d+[a-z]?\.dmg)"> @@ -43,33 +43,11 @@ Processor EndOfCheckPhase - - Arguments - - archive_path - %pathname% - destination_path - %RECIPE_CACHE_DIR%/%NAME%/Applications - purge_destination - - - Processor - Unarchiver - - - Arguments - - pattern - %RECIPE_CACHE_DIR%/%NAME%/Applications/*/BlueJ.app - - Processor - FileFinder - Arguments input_path - %found_filename% + %pathname%/BlueJ.app requirement identifier "org.bluej.BlueJ" and anchor apple generic and 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] = "5DNSMBAM8L" @@ -80,7 +58,7 @@ Arguments input_plist_path - %found_filename%/Contents/Info.plist + %pathname%/BlueJ.app/Contents/Info.plist plist_version_key CFBundleShortVersionString diff --git a/BlueJ/BlueJ.munki.recipe b/BlueJ/BlueJ.munki.recipe index d5452ff6a..ded4489f1 100644 --- a/BlueJ/BlueJ.munki.recipe +++ b/BlueJ/BlueJ.munki.recipe @@ -40,31 +40,11 @@ com.github.n8felton.download.BlueJ Process - - Arguments - - pattern - %RECIPE_CACHE_DIR%/%NAME%/Applications/*/BlueJ.app - - Processor - FileFinder - - - Arguments - - dmg_path - %RECIPE_CACHE_DIR%/%NAME%.dmg - dmg_root - %found_filename% - - Processor - DmgCreator - Arguments pkg_path - %dmg_path% + %pathname% repo_subdirectory %MUNKI_REPO_SUBDIR% From 5503ed4233ba901436ff7b179b9a79a5b68bab1e Mon Sep 17 00:00:00 2001 From: Paul Cossey Date: Thu, 18 Apr 2024 16:01:30 +0100 Subject: [PATCH 2/3] Update Tidal.download.recipe Adds Architecture specific downloads --- Tidal/Tidal.download.recipe | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Tidal/Tidal.download.recipe b/Tidal/Tidal.download.recipe index e3fb63c6f..150637d45 100644 --- a/Tidal/Tidal.download.recipe +++ b/Tidal/Tidal.download.recipe @@ -3,7 +3,10 @@ Description - Downloads the latest version of Tidal. + Downloads the latest version of Tidal. + +To download Intel use: "x64" in the ARCH_TYPE variable +To Download Apple Silicon use: "arm64" in the ARCH_TYPE variable Identifier com.github.n8felton.download.Tidal MinimumVersion @@ -12,6 +15,8 @@ NAME Tidal + ARCH_TYPE + x64 Process @@ -21,7 +26,7 @@ Arguments url - https://download.tidal.com/desktop/TIDAL.dmg + https://download.tidal.com/desktop/TIDAL.%ARCH_TYPE%.dmg From abb2e1253bf92476f4b5d43ff726c5307638bf53 Mon Sep 17 00:00:00 2001 From: Paul Cossey Date: Wed, 17 Jul 2024 16:44:00 +0100 Subject: [PATCH 3/3] Update MAMP.download.recipe Updated to account for vendor URL changes --- MAMP/MAMP.download.recipe | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MAMP/MAMP.download.recipe b/MAMP/MAMP.download.recipe index da2ba961b..329706595 100644 --- a/MAMP/MAMP.download.recipe +++ b/MAMP/MAMP.download.recipe @@ -5,13 +5,13 @@ Description Downloads the latest version of MAMP. -ARCH_TYPE is "Intel-x86" or "M1-arm" +ARCH_TYPE is "Intel-x86" or "Apple-chip" Identifier com.github.n8felton.download.MAMP Input DOWNLOAD_URL - https://downloads.mamp.info/MAMP-PRO/releases + https://downloads.mamp.info/MAMP-PRO/macOS/MAMP-PRO NAME MAMP SEARCH_URL @@ -31,7 +31,7 @@ ARCH_TYPE is "Intel-x86" or "M1-arm" url %SEARCH_URL% re_pattern - (?P<filename>MAMP_MAMP_PRO_(?P<version>((?:(\d+)\.)?(?:(\d+)\.)?(\*|\d+)))\-%ARCH_TYPE%).pkg" + (?P<filename>MAMP-MAMP-PRO-(?P<version>((?:(\d+)\.)?(?:(\d+)\.)?(\*|\d+)))\-%ARCH_TYPE%).pkg" @@ -40,7 +40,7 @@ ARCH_TYPE is "Intel-x86" or "M1-arm" Arguments url - %DOWNLOAD_URL%/%version%/%filename%.pkg + %DOWNLOAD_URL%/%filename%.pkg filename %filename%-%version%.pkg