Skip to content

Commit

Permalink
Update BlueJ
Browse files Browse the repository at this point in the history
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
  • Loading branch information
paul-cossey authored and n8felton committed Jan 5, 2024
1 parent 2a73483 commit e200516
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 46 deletions.
28 changes: 3 additions & 25 deletions BlueJ/BlueJ.download.recipe
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<key>url</key>
<string>%DOWNLOAD_URL%</string>
<key>re_pattern</key>
<string>&lt;a href=&quot;download/files/(BlueJ-mac-\d+[a-z]?\.zip)&quot;&gt;</string>
<string>&lt;a href=&quot;download/files/(BlueJ-mac-\d+[a-z]?\.dmg)&quot;&gt;</string>
</dict>
</dict>
<dict>
Expand All @@ -43,33 +43,11 @@
<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>pattern</key>
<string>%RECIPE_CACHE_DIR%/%NAME%/Applications/*/BlueJ.app</string>
</dict>
<key>Processor</key>
<string>FileFinder</string>
</dict>
<dict>
<key>Arguments</key>
<dict>
<key>input_path</key>
<string>%found_filename%</string>
<string>%pathname%/BlueJ.app</string>
<key>requirement</key>
<string>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"</string>
</dict>
Expand All @@ -80,7 +58,7 @@
<key>Arguments</key>
<dict>
<key>input_plist_path</key>
<string>%found_filename%/Contents/Info.plist</string>
<string>%pathname%/BlueJ.app/Contents/Info.plist</string>
<key>plist_version_key</key>
<string>CFBundleShortVersionString</string>
</dict>
Expand Down
22 changes: 1 addition & 21 deletions BlueJ/BlueJ.munki.recipe
Original file line number Diff line number Diff line change
Expand Up @@ -40,31 +40,11 @@
<string>com.github.n8felton.download.BlueJ</string>
<key>Process</key>
<array>
<dict>
<key>Arguments</key>
<dict>
<key>pattern</key>
<string>%RECIPE_CACHE_DIR%/%NAME%/Applications/*/BlueJ.app</string>
</dict>
<key>Processor</key>
<string>FileFinder</string>
</dict>
<dict>
<key>Arguments</key>
<dict>
<key>dmg_path</key>
<string>%RECIPE_CACHE_DIR%/%NAME%.dmg</string>
<key>dmg_root</key>
<string>%found_filename%</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>
Expand Down

0 comments on commit e200516

Please sign in to comment.