timsutton / aamporter

Utility to batch download Adobe Creative Suite/Cloud updates and optionally import them into a Munki repository.
MIT License
86 stars 14 forks source link

Using the aamporter.plist for expanded Munki meta keys #20

Closed joncohen closed 8 years ago

joncohen commented 8 years ago

I have setup my primary download plists for each of my ccp packages - those are working without issue. What I'm having issues with is setting a catalog and developer for the new updates that I'm importing.

Here is my aamporter.plist

<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
    <<key>munkiimport_options</key>
    <array>
        <string>--category=AdobeUpdates</string>
        <string>--developer=Adobe</string>
        <string>--catalog=aamporter</string>
    </array>
</dict>
</plist>

When I run aamporter.py --munkiimport -p AdobeCCBridge.ccp.plist aamporter recognizes that I have additional munkiimport options, but they do not make it into my munki plist.

Munki plist (generated from aamporter munkiimport).

<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
    <key>AdobeSetupType</key>
    <string>ProductInstall</string>
    <key>_metadata</key>
    <dict>
        <key>created_by</key>
        <string>joncohen</string>
        <key>creation_date</key>
        <date>2015-12-04T19:16:33Z</date>
        <key>munki_version</key>
        <string>2.4.0.2561</string>
        <key>os_version</key>
        <string>10.10.5</string>
    </dict>
    <key>autoremove</key>
    <false/>
    <key>catalogs</key>
    <array>
        <string>testing</string>
    </array>
    <key>description</key>
    <string>This update includes critical bug fixes to improve the stability of the application.</string>
    <key>display_name</key>
    <string>Adobe Bridge CC 6.1.1 Update</string>
    <key>installed_size</key>
    <integer>1203894</integer>
    <key>installer_item_hash</key>
    <string>53e2b4da2d3c10c5f371a58f22a256a4e629b18f068948c31fe501700a198d6d</string>
    <key>installer_item_location</key>
    <string>apps/Adobe/CC/2014/updates/AdobeBridgeCC-6.0-6.1.1.dmg</string>
    <key>installer_item_size</key>
    <integer>194037</integer>
    <key>installer_type</key>
    <string>AdobeCS5PatchInstaller</string>
    <key>installs</key>
    <array>
        <dict>
            <key>path</key>
            <string>/Library/Application Support/Adobe/Uninstall/{0BE08A15-B153-4737-88B0-2783A56C55CB}.db</string>
            <key>type</key>
            <string>file</string>
        </dict>
    </array>
    <key>minimum_os_version</key>
    <string>10.4.0</string>
    <key>name</key>
    <string>AdobeBridgeCC_6.0_Update</string>
    <key>payloads</key>
    <array>
        <dict>
            <key>AdobeCode</key>
            <string>{0BE08A15-B153-4737-88B0-2783A56C55CB}</string>
            <key>display_name</key>
            <string>Adobe Bridge CC</string>
            <key>installed_size</key>
            <integer>1203894</integer>
            <key>version</key>
            <string>6.1.1</string>
        </dict>
    </array>
    <key>uninstallable</key>
    <false/>
    <key>update_for</key>
    <array>
        <string>AdobeCCBridge</string>
    </array>
    <key>version</key>
    <string>6.1.1</string>
</dict>
</plist>

This is my aamporter product plist.

<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
    <key>channels</key>
    <array>
        <string>AdobeAPE3.4_Mac_NoLocale</string>
        <string>AdobeBridgeCC-6.0</string>
        <string>AdobeMiniBridge3-3</string>
        <string>AdobeSwitchBoard3-3</string>
        <string>CameraProfilesInstaller-8.0</string>
        <string>PhotoshopCameraRaw8-8.0</string>
    </array>
    <key>munki_update_for</key>
    <array>
        <string>AdobeCCBridge</string>
    </array>
    <key>munki_repo_destination_path</key>
    <string>apps/Adobe/CC/2014/updates</string>
</dict>
</plist>
timsutton commented 8 years ago

You have a malformed aamporter.plist (see the <<key> tag at the top).

Also, for aamporter.plist, I'm not sure where yours is located, but it has to be located alongside the aamporter.py wherever it's residing.

joncohen commented 8 years ago

wow - thank you

timsutton commented 8 years ago

Also notice if aamporter detects a settings file but it's corrupt, it will error out saying that it could not be parsed.