Skip to content

Commit

Permalink
Update Cloudflare WARP Recipes
Browse files Browse the repository at this point in the history 
Download recipe
- Updated download URL and file format
- Removes unnecessary steps

Munki
- Path change to account for changes in the download recipe
- Adds support for derive_minimum_os_version
- Removes unnecessary steps to simplify the recipe
  • Loading branch information
@paul-cossey
paul-cossey committed Jul 8, 2024
1 parent 1de62e8 commit 7bf48a9
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 71 deletions.
19 changes: 3 additions & 16 deletions Cloudflare WARP/Cloudflare WARP.download.recipe
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
<key>Arguments</key>
<dict>
<key>filename</key>
<string>%NAME%.zip</string>
<string>%NAME%.pkg</string>
<key>url</key>
<string>https://1111-releases.cloudflareclient.com/mac/Cloudflare_WARP.zip</string>
<string>https://1111-releases.cloudflareclient.com/mac/latest</string>
</dict>
<key>Processor</key>
<string>URLDownloader</string>
Expand All @@ -30,19 +30,6 @@
<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%</string>
<key>purge_destination</key>
<true/>
</dict>
<key>Processor</key>
<string>Unarchiver</string>
</dict>
<dict>
<key>Arguments</key>
<dict>
Expand All @@ -53,7 +40,7 @@
<string>Apple Root CA</string>
</array>
<key>input_path</key>
<string>%RECIPE_CACHE_DIR%/%NAME%/Cloudflare_WARP*.pkg</string>
<string>%RECIPE_CACHE_DIR%/downloads/%NAME%.pkg</string>
</dict>
<key>Processor</key>
<string>CodeSignatureVerifier</string>
Expand Down
65 changes: 10 additions & 55 deletions Cloudflare WARP/Cloudflare WARP.munki.recipe
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
<plist version="1.0">
<dict>
<key>Description</key>
<string>Downloads the latest version of Cloudflare WARP and imports it into Munki.</string>
<string>Downloads the latest version of Cloudflare WARP and imports it into Munki.

Set the DERIVE_MIN_OS variable to a non-empty string to set the minimum_os_version via MunkiInstallsItemsCreator. This requires a minimum AutoPkg version of 2.7 please update if you're not already running it.</string>
<key>Identifier</key>
<string>com.github.dataJAR-recipes.munki.Cloudflare WARP</string>
<key>Input</key>
Expand All @@ -12,6 +14,8 @@
<string>apps/%NAME%</string>
<key>NAME</key>
<string>CloudflareWARP</string>
<key>DERIVE_MIN_OS</key>
<string>YES</string>
<key>pkginfo</key>
<dict>
<key>blocking_applications</key>
Expand Down Expand Up @@ -161,7 +165,7 @@ exit 0</string>
</dict>
</dict>
<key>MinimumVersion</key>
<string>1.1</string>
<string>2.7</string>
<key>ParentRecipe</key>
<string>com.github.dataJAR-recipes.download.Cloudflare WARP</string>
<key>Process</key>
Expand All @@ -172,7 +176,7 @@ exit 0</string>
<key>destination_path</key>
<string>%RECIPE_CACHE_DIR%/unpack</string>
<key>flat_pkg_path</key>
<string>%RECIPE_CACHE_DIR%/%NAME%/Cloudflare_WARP.pkg</string>
<string>%RECIPE_CACHE_DIR%/downloads/%NAME%.pkg</string>
<key>purge_destination</key>
<true/>
</dict>
Expand Down Expand Up @@ -201,33 +205,13 @@ exit 0</string>
<key>Processor</key>
<string>PkgPayloadUnpacker</string>
</dict>
<dict>
<key>Arguments</key>
<dict>
<key>input_plist_path</key>
<string>%RECIPE_CACHE_DIR%/Applications/Cloudflare WARP.app/Contents/Info.plist</string>
<key>plist_version_key</key>
<string>CFBundleShortVersionString</string>
</dict>
<key>Processor</key>
<string>Versioner</string>
</dict>
<dict>
<key>Arguments</key>
<dict>
<key>dmg_path</key>
<string>%RECIPE_CACHE_DIR%/%NAME%-%version%.dmg</string>
<key>dmg_root</key>
<string>%RECIPE_CACHE_DIR%/%NAME%</string>
</dict>
<key>Processor</key>
<string>DmgCreator</string>
</dict>
<dict>
<key>Arguments</key>
<dict>
<key>faux_root</key>
<string>%RECIPE_CACHE_DIR%</string>
<key>derive_minimum_os_version</key>
<string>%DERIVE_MIN_OS%</string>
<key>installs_item_paths</key>
<array>
<string>/Applications/Cloudflare WARP.app</string>
Expand All @@ -240,39 +224,11 @@ exit 0</string>
<key>Processor</key>
<string>MunkiPkginfoMerger</string>
</dict>
<dict>
<key>Arguments</key>
<dict>
<key>info_path</key>
<string>%RECIPE_CACHE_DIR%/Applications/Cloudflare WARP.app</string>
<key>plist_keys</key>
<dict>
<key>LSMinimumSystemVersion</key>
<string>min_os_ver</string>
</dict>
</dict>
<key>Processor</key>
<string>PlistReader</string>
</dict>
<dict>
<key>Arguments</key>
<dict>
<key>additional_pkginfo</key>
<dict>
<key>version</key>
<string>%version%</string>
<key>minimum_os_version</key>
<string>%min_os_ver%</string>
</dict>
</dict>
<key>Processor</key>
<string>MunkiPkginfoMerger</string>
</dict>
<dict>
<key>Arguments</key>
<dict>
<key>pkg_path</key>
<string>%dmg_path%</string>
<string>%RECIPE_CACHE_DIR%/downloads/%NAME%.pkg</string>
<key>repo_subdirectory</key>
<string>%MUNKI_REPO_SUBDIR%</string>
<key>version_comparison_key</key>
Expand All @@ -288,7 +244,6 @@ exit 0</string>
<array>
<string>%RECIPE_CACHE_DIR%/unpack</string>
<string>%RECIPE_CACHE_DIR%/Applications</string>
<string>%RECIPE_CACHE_DIR%/%NAME%</string>
</array>
</dict>
<key>Processor</key>
Expand Down

0 comments on commit 7bf48a9

Please sign in to comment.