Update DFUBlaster.munki.recipe #8

paul-cossey · 2024-11-25T15:27:28Z

In the current recipe the version variable doesn't match the version_comparison_key

This PR sets the version variable to match the version comparison key of CFBundleShortVersionString

Output from a successful -v run

autopkg run -v DFUBlaster.munki.recipe
Looking for com.github.kevinmcox.download.DFUBlaster...
Did not find com.github.kevinmcox.download.DFUBlaster in recipe map
Rebuilding recipe map with current working directories...
Looking for com.github.kevinmcox.download.DFUBlaster...
Found com.github.kevinmcox.download.DFUBlaster in recipe map
**load_recipe time: 0.0070715420006308705
Processing DFUBlaster.munki.recipe...
WARNING: DFUBlaster.munki.recipe is missing trust info and FAIL_RECIPES_WITHOUT_TRUST_INFO is not set. Proceeding...
URLTextSearcher
URLTextSearcher: Found matching text (match): /twocanoes/dfu-blaster-public/downloads/PreBeta-DFU_Blaster_Pro_Build-3115_Version-3.2.dmg
URLDownloader
URLDownloader: Storing new Last-Modified header: Fri, 15 Nov 2024 03:29:17 GMT
URLDownloader: Storing new ETag header: "f96b904efba9e42f834f78bf8a3ee971-2"
URLDownloader: Downloaded /Users/paul.cossey/Library/AutoPkg/Cache/com.github.kevinmcox.munki.DFUBlaster/downloads/DFUBlaster.dmg
EndOfCheckPhase
CodeSignatureVerifier
CodeSignatureVerifier: Mounted disk image /Users/paul.cossey/Library/AutoPkg/Cache/com.github.kevinmcox.munki.DFUBlaster/downloads/DFUBlaster.dmg
CodeSignatureVerifier: Verifying installer package signature...
CodeSignatureVerifier: Package "DFU Blaster Pro.pkg":
CodeSignatureVerifier:    Status: signed by a developer certificate issued by Apple for distribution
CodeSignatureVerifier:    Notarization: trusted by the Apple notary service
CodeSignatureVerifier:    Signed with a trusted timestamp on: 2024-11-15 03:28:04 +0000
CodeSignatureVerifier:    Certificate Chain:
CodeSignatureVerifier:     1. Developer ID Installer: Twocanoes Software, Inc. (UXP6YEHSPW)
CodeSignatureVerifier:        Expires: 2027-02-01 22:12:15 +0000
CodeSignatureVerifier:        SHA256 Fingerprint:
CodeSignatureVerifier:            BC 8A 6D 46 65 21 2B 54 4D 3C 19 7D 05 00 F7 20 41 AB 5B C6 47 A4 
CodeSignatureVerifier:            53 26 60 1A 3A 75 9C B6 DC 60
CodeSignatureVerifier:        ------------------------------------------------------------------------
CodeSignatureVerifier:     2. Developer ID Certification Authority
CodeSignatureVerifier:        Expires: 2027-02-01 22:12:15 +0000
CodeSignatureVerifier:        SHA256 Fingerprint:
CodeSignatureVerifier:            7A FC 9D 01 A6 2F 03 A2 DE 96 37 93 6D 4A FE 68 09 0D 2D E1 8D 03 
CodeSignatureVerifier:            F2 9C 88 CF B0 B1 BA 63 58 7F
CodeSignatureVerifier:        ------------------------------------------------------------------------
CodeSignatureVerifier:     3. Apple Root CA
CodeSignatureVerifier:        Expires: 2035-02-09 21:40:36 +0000
CodeSignatureVerifier:        SHA256 Fingerprint:
CodeSignatureVerifier:            B0 B1 73 0E CB C7 FF 45 05 14 2C 49 F1 29 5E 6E DA 6B CA ED 7E 2C 
CodeSignatureVerifier:            68 C5 BE 91 B5 A1 10 01 F0 24
CodeSignatureVerifier: 
CodeSignatureVerifier: Signature is valid
CodeSignatureVerifier: Authority name chain is valid
FlatPkgUnpacker
FlatPkgUnpacker: Mounted disk image /Users/paul.cossey/Library/AutoPkg/Cache/com.github.kevinmcox.munki.DFUBlaster/downloads/DFUBlaster.dmg
FlatPkgUnpacker: Unpacked /private/tmp/dmg.xKigwl/DFU Blaster Pro.pkg to /Users/paul.cossey/Library/AutoPkg/Cache/com.github.kevinmcox.munki.DFUBlaster/unpack
PkgPayloadUnpacker
PkgPayloadUnpacker: Unpacked /Users/paul.cossey/Library/AutoPkg/Cache/com.github.kevinmcox.munki.DFUBlaster/unpack/DFU_Blaster_Pro.pkg/payload to /Users/paul.cossey/Library/AutoPkg/Cache/com.github.kevinmcox.munki.DFUBlaster/payload/
MunkiInstallsItemsCreator
MunkiInstallsItemsCreator: Created installs item for /Applications/DFU Blaster Pro.app
MunkiInstallsItemsCreator: Derived minimum os version as: 14.0
MunkiPkginfoMerger
MunkiPkginfoMerger: Merged {'installs': [{'CFBundleIdentifier': 'com.twocanoes.DFU-Blaster-Pro', 'CFBundleName': 'DFU Blaster Pro', 'CFBundleShortVersionString': '3.2', 'CFBundleVersion': '3115', 'minosversion': '14.0', 'path': '/Applications/DFU Blaster Pro.app', 'type': 'application', 'version_comparison_key': 'CFBundleShortVersionString'}], 'minimum_os_version': '14.0'} into pkginfo
Versioner
Versioner: Found version 3.2 in file /Users/paul.cossey/Library/AutoPkg/Cache/com.github.kevinmcox.munki.DFUBlaster/payload/Applications/DFU Blaster Pro.app/Contents/Info.plist
MunkiPkginfoMerger
MunkiPkginfoMerger: Merged {'version': '3.2'} into pkginfo
MunkiImporter
MunkiImporter: Using repo lib: AutoPkgLib
MunkiImporter:         plugin: FileRepo
MunkiImporter:           repo: /Users/Shared/munki_repo
MunkiImporter: Copied pkginfo to: /Users/Shared/munki_repo/pkgsinfo/utilities/DFUBlaster/DFUBlaster-3.2.plist
MunkiImporter:            pkg to: /Users/Shared/munki_repo/pkgs/utilities/DFUBlaster/DFUBlaster-3.2.dmg
PathDeleter
PathDeleter: Deleted /Users/paul.cossey/Library/AutoPkg/Cache/com.github.kevinmcox.munki.DFUBlaster/payload/
PathDeleter: Deleted /Users/paul.cossey/Library/AutoPkg/Cache/com.github.kevinmcox.munki.DFUBlaster/unpack
Receipt written to /Users/paul.cossey/Library/AutoPkg/Cache/com.github.kevinmcox.munki.DFUBlaster/receipts/DFUBlaster.munki-receipt-20241125-150736.plist

The following new items were downloaded:
    Download Path                                                                                            
    -------------                                                                                            
    /Users/paul.cossey/Library/AutoPkg/Cache/com.github.kevinmcox.munki.DFUBlaster/downloads/DFUBlaster.dmg  

The following new items were imported into Munki:
    Name        Version  Catalogs  Pkginfo Path                               Pkg Repo Path                            Icon Repo Path  
    ----        -------  --------  ------------                               -------------                            --------------  
    DFUBlaster  3.2      testing   utilities/DFUBlaster/DFUBlaster-3.2.plist  utilities/DFUBlaster/DFUBlaster-3.2.dmg

Sets the version variable to match the version comparison key of CFBundleShortVersionString

kevinmcox · 2024-11-29T21:51:55Z

Thanks for the PR @paul-cossey, but I actually think the fix we need is to compare on CFBundleVersion instead of CFBundleShortVersionString.

There are a ton releases where only the build increases, but not the version number:

And then from the Info.plist files:

<key>CFBundleShortVersionString</key>
<string>3.1</string>
<key>CFBundleVersion</key>
<string>3109</string>

and

<key>CFBundleShortVersionString</key>
<string>3.1</string>
<key>CFBundleVersion</key>
<string>3110</string>

- Updated to use `CFBundleVersion`

paul-cossey · 2024-12-06T12:22:40Z

Hi, @kevinmcox

Ok, changes made. It's a shame CFBundleShortVersionString isn't a combo of both. Hey ho.

With the changes in the latest commit

autopkg run -v DFUBlaster.munki.recipe
Looking for com.github.kevinmcox.download.DFUBlaster...
Did not find com.github.kevinmcox.download.DFUBlaster in recipe map
Rebuilding recipe map with current working directories...
Looking for com.github.kevinmcox.download.DFUBlaster...
Found com.github.kevinmcox.download.DFUBlaster in recipe map
**load_recipe time: 0.0062982090003060875
Processing DFUBlaster.munki.recipe...
WARNING: DFUBlaster.munki.recipe is missing trust info and FAIL_RECIPES_WITHOUT_TRUST_INFO is not set. Proceeding...
URLTextSearcher
URLTextSearcher: Found matching text (match): /twocanoes/dfu-blaster-public/downloads/PreBeta-DFU_Blaster_Pro_Build-3115_Version-3.2.dmg
URLDownloader
URLDownloader: Storing new Last-Modified header: Fri, 15 Nov 2024 03:29:17 GMT
URLDownloader: Storing new ETag header: "f96b904efba9e42f834f78bf8a3ee971-2"
URLDownloader: Downloaded /Users/paul.cossey/Library/AutoPkg/Cache/com.github.kevinmcox.munki.DFUBlaster/downloads/DFUBlaster.dmg
EndOfCheckPhase
CodeSignatureVerifier
CodeSignatureVerifier: Mounted disk image /Users/paul.cossey/Library/AutoPkg/Cache/com.github.kevinmcox.munki.DFUBlaster/downloads/DFUBlaster.dmg
CodeSignatureVerifier: Verifying installer package signature...
CodeSignatureVerifier: Package "DFU Blaster Pro.pkg":
CodeSignatureVerifier:    Status: signed by a developer certificate issued by Apple for distribution
CodeSignatureVerifier:    Notarization: trusted by the Apple notary service
CodeSignatureVerifier:    Signed with a trusted timestamp on: 2024-11-15 03:28:04 +0000
CodeSignatureVerifier:    Certificate Chain:
CodeSignatureVerifier:     1. Developer ID Installer: Twocanoes Software, Inc. (UXP6YEHSPW)
CodeSignatureVerifier:        Expires: 2027-02-01 22:12:15 +0000
CodeSignatureVerifier:        SHA256 Fingerprint:
CodeSignatureVerifier:            BC 8A 6D 46 65 21 2B 54 4D 3C 19 7D 05 00 F7 20 41 AB 5B C6 47 A4 
CodeSignatureVerifier:            53 26 60 1A 3A 75 9C B6 DC 60
CodeSignatureVerifier:        ------------------------------------------------------------------------
CodeSignatureVerifier:     2. Developer ID Certification Authority
CodeSignatureVerifier:        Expires: 2027-02-01 22:12:15 +0000
CodeSignatureVerifier:        SHA256 Fingerprint:
CodeSignatureVerifier:            7A FC 9D 01 A6 2F 03 A2 DE 96 37 93 6D 4A FE 68 09 0D 2D E1 8D 03 
CodeSignatureVerifier:            F2 9C 88 CF B0 B1 BA 63 58 7F
CodeSignatureVerifier:        ------------------------------------------------------------------------
CodeSignatureVerifier:     3. Apple Root CA
CodeSignatureVerifier:        Expires: 2035-02-09 21:40:36 +0000
CodeSignatureVerifier:        SHA256 Fingerprint:
CodeSignatureVerifier:            B0 B1 73 0E CB C7 FF 45 05 14 2C 49 F1 29 5E 6E DA 6B CA ED 7E 2C 
CodeSignatureVerifier:            68 C5 BE 91 B5 A1 10 01 F0 24
CodeSignatureVerifier: 
CodeSignatureVerifier: Signature is valid
CodeSignatureVerifier: Authority name chain is valid
FlatPkgUnpacker
FlatPkgUnpacker: Mounted disk image /Users/paul.cossey/Library/AutoPkg/Cache/com.github.kevinmcox.munki.DFUBlaster/downloads/DFUBlaster.dmg
FlatPkgUnpacker: Unpacked /private/tmp/dmg.nkgEu0/DFU Blaster Pro.pkg to /Users/paul.cossey/Library/AutoPkg/Cache/com.github.kevinmcox.munki.DFUBlaster/unpack
PkgPayloadUnpacker
PkgPayloadUnpacker: Unpacked /Users/paul.cossey/Library/AutoPkg/Cache/com.github.kevinmcox.munki.DFUBlaster/unpack/DFU_Blaster_Pro.pkg/payload to /Users/paul.cossey/Library/AutoPkg/Cache/com.github.kevinmcox.munki.DFUBlaster/payload/
MunkiInstallsItemsCreator
MunkiInstallsItemsCreator: Created installs item for /Applications/DFU Blaster Pro.app
MunkiInstallsItemsCreator: Derived minimum os version as: 14.0
MunkiPkginfoMerger
MunkiPkginfoMerger: Merged {'installs': [{'CFBundleIdentifier': 'com.twocanoes.DFU-Blaster-Pro', 'CFBundleName': 'DFU Blaster Pro', 'CFBundleShortVersionString': '3.2', 'CFBundleVersion': '3115', 'minosversion': '14.0', 'path': '/Applications/DFU Blaster Pro.app', 'type': 'application', 'version_comparison_key': 'CFBundleVersion'}], 'minimum_os_version': '14.0'} into pkginfo
Versioner
Versioner: Found version 3115 in file /Users/paul.cossey/Library/AutoPkg/Cache/com.github.kevinmcox.munki.DFUBlaster/payload/Applications/DFU Blaster Pro.app/Contents/Info.plist
MunkiPkginfoMerger
MunkiPkginfoMerger: Merged {'version': '3115'} into pkginfo
MunkiImporter
MunkiImporter: Using repo lib: AutoPkgLib
MunkiImporter:         plugin: FileRepo
MunkiImporter:           repo: /Users/Shared/munki_repo
MunkiImporter: Copied pkginfo to: /Users/Shared/munki_repo/pkgsinfo/utilities/DFUBlaster/DFUBlaster-3115.plist
MunkiImporter:            pkg to: /Users/Shared/munki_repo/pkgs/utilities/DFUBlaster/DFUBlaster-3115.dmg
PathDeleter
PathDeleter: Deleted /Users/paul.cossey/Library/AutoPkg/Cache/com.github.kevinmcox.munki.DFUBlaster/payload/
PathDeleter: Deleted /Users/paul.cossey/Library/AutoPkg/Cache/com.github.kevinmcox.munki.DFUBlaster/unpack
Receipt written to /Users/paul.cossey/Library/AutoPkg/Cache/com.github.kevinmcox.munki.DFUBlaster/receipts/DFUBlaster.munki-receipt-20241206-121753.plist

The following new items were downloaded:
    Download Path                                                                                            
    -------------                                                                                            
    /Users/paul.cossey/Library/AutoPkg/Cache/com.github.kevinmcox.munki.DFUBlaster/downloads/DFUBlaster.dmg  

The following new items were imported into Munki:
    Name        Version  Catalogs  Pkginfo Path                                Pkg Repo Path                             Icon Repo Path  
    ----        -------  --------  ------------                                -------------                             --------------  
    DFUBlaster  3115     testing   utilities/DFUBlaster/DFUBlaster-3115.plist  utilities/DFUBlaster/DFUBlaster-3115.dmg

Update DFUBlaster.munki.recipe

8bab4c7

Sets the version variable to match the version comparison key of CFBundleShortVersionString

Update DFUBlaster.munki.recipe

a4e7062

- Updated to use `CFBundleVersion`

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update DFUBlaster.munki.recipe #8

Update DFUBlaster.munki.recipe #8

paul-cossey commented Nov 25, 2024

kevinmcox commented Nov 29, 2024

paul-cossey commented Dec 6, 2024

Update DFUBlaster.munki.recipe #8

Are you sure you want to change the base?

Update DFUBlaster.munki.recipe #8

Conversation

paul-cossey commented Nov 25, 2024

kevinmcox commented Nov 29, 2024

paul-cossey commented Dec 6, 2024