mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-04-21 12:08:22 -05:00
Code Issues Packages Projects Releases Wiki Activity
189 Commits 9 Branches 119 Tags
b2ef8d288f1344bddd5d6609b79f6f9cb5c21927
Commit Graph

131 Commits

Author SHA1 Message Date
Greg Neagle b2ef8d288f Minor bug fixes and code cleanup. 
git-svn-id: http://munki.googlecode.com/svn/trunk@298 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-30 15:27:43 +00:00
Greg Neagle 13cdb31c28 Changes to output for better progress indication when there are multiple items to be installed or removed. 
git-svn-id: http://munki.googlecode.com/svn/trunk@297 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-30 15:27:04 +00:00
Greg Neagle fce4f6fab2 Added a check for diskimages with Software License Agreements. These cannot be automatically mounted by hdiutil, so they are useless to munki. 
git-svn-id: http://munki.googlecode.com/svn/trunk@295 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-23 22:58:56 +00:00
Greg Neagle 2141e264ee Fixed issue with removals in included manifests that don't have their own catalog lists, but instead rely on the parent's catalog list. 
git-svn-id: http://munki.googlecode.com/svn/trunk@294 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-23 17:46:18 +00:00
Greg Neagle 660a8a8e98 Added support for "appdmg" package type. This is a dmg that contains a single application at the root of the mounted dmg, which is then copied to /Applications (for install) or simply rm -rf /Applications/appname (for removal). 
makepkginfo generates pkginfo files for this package type, and updatecheck.py and installer.py have the appropriate additions.

git-svn-id: http://munki.googlecode.com/svn/trunk@279 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-22 21:42:57 +00:00
Greg Neagle 83e10ef4b6 Updated adobeutils.getAdobeUpdateInfo() to handle update DMGs with multiple payloads. 
Removed makeadobepkinfo, as its functionality has been merged into makepkginfo


git-svn-id: http://munki.googlecode.com/svn/trunk@277 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-21 22:04:49 +00:00
Greg Neagle ebaf5ded27 Added getAdobeUpdateInfo() to parse Adobe update DMGs for pkginfo. 
git-svn-id: http://munki.googlecode.com/svn/trunk@276 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-21 18:56:26 +00:00
Greg Neagle c88108f207 Merged makeadobepkginfo and makepkginfo. 
git-svn-id: http://munki.googlecode.com/svn/trunk@275 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-21 18:55:21 +00:00
Greg Neagle f8b28a05fb makepkginfo can now be called with only -f arguments, and no actual install item. This generates a list of filesystem items which can by manually added to the 'installs' key of a pkginfo item. 
git-svn-id: http://munki.googlecode.com/svn/trunk@266 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-20 23:37:46 +00:00
Greg Neagle dd711731f9 Support for AdobeUberInstaller packages like those from CS4 Deployment Toolkit and Adobe Update packages. 
Includes new makeadobepkginfo tool, which eventually will be merged with makepkginfo...

git-svn-id: http://munki.googlecode.com/svn/trunk@265 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-20 23:36:04 +00:00
Greg Neagle b947daf2f9 Added Apache 2 license info. 
git-svn-id: http://munki.googlecode.com/svn/trunk@264 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-16 23:58:44 +00:00
Greg Neagle bc84138b11 First attempt at support for installing Adobe CS4 stuff using their Uber tools. 
git-svn-id: http://munki.googlecode.com/svn/trunk@263 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-16 23:58:05 +00:00
Greg Neagle c4ed70e9f1 Fixes to Apple Update logic. 
git-svn-id: http://munki.googlecode.com/svn/trunk@261 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-14 22:14:51 +00:00
Greg Neagle da4b3cd5b6 Apple Software Updates logic fixes. 
git-svn-id: http://munki.googlecode.com/svn/trunk@260 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-14 22:13:17 +00:00
Greg Neagle a2c387d657 Various regression fixes. 
git-svn-id: http://munki.googlecode.com/svn/trunk@259 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-14 22:12:41 +00:00
Greg Neagle 80515793f5 Fixed errors in getSoftwareUpdateInfo() 
git-svn-id: http://munki.googlecode.com/svn/trunk@257 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-13 23:34:30 +00:00
Greg Neagle 4dc3cc93cb Minor output tweak in log info for dependencies. 
git-svn-id: http://munki.googlecode.com/svn/trunk@256 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-13 23:33:20 +00:00
Greg Neagle 28da312e9a Removed code that does the actual restart. This has been moved to managedsoftwareupdate. 
git-svn-id: http://munki.googlecode.com/svn/trunk@255 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-13 23:32:11 +00:00
Greg Neagle dce3cd1bb5 Added missing import time. 
git-svn-id: http://munki.googlecode.com/svn/trunk@254 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-13 23:31:16 +00:00
Greg Neagle 2412154c7a Changes to munkistatus.py: 
Looks for an existing running version of MunkiStatus before trying to launch MunkiStatus.
New hide() and show() functions to hide and show the MunkiStatus window.

git-svn-id: http://munki.googlecode.com/svn/trunk@250 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-13 22:03:37 +00:00
Greg Neagle fdaa8f0f2a Added appleupdates.py, which contains functions for working with Apple's Software Update. 
Changes to managedsoftwareupdate, munkicommon/py and installer.py to deal with Apple Software Update.

git-svn-id: http://munki.googlecode.com/svn/trunk@249 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-13 22:01:28 +00:00
Greg Neagle 68c78c0ebe Fixed a typo in the new support for 'maximum_os_version' 
git-svn-id: http://munki.googlecode.com/svn/trunk@247 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-02 23:13:51 +00:00
Greg Neagle 20f97877fd updatecheck.py: Added support for "maximum_os_version" key in pkginfo 
git-svn-id: http://munki.googlecode.com/svn/trunk@246 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-02 23:07:29 +00:00
Greg Neagle 516d7d75f3 Add filepath to exception raised in readPlist when it's a bad plist file. 
git-svn-id: http://munki.googlecode.com/svn/trunk@245 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-02 22:02:40 +00:00
Greg Neagle 96251a968e Fix in special-case processing of Microsoft Office 2008 packages on Snow Leopard. 
git-svn-id: http://munki.googlecode.com/svn/trunk@244 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-02 22:01:14 +00:00
Greg Neagle 9bcc50a325 Smarter handling of malformed Info.plists in packages. Instead of throwing an exception, return pkginfo describing the problem. 
git-svn-id: http://munki.googlecode.com/svn/trunk@243 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-02 22:00:17 +00:00
Greg Neagle 33e0d69436 Fixed bug in munkicommon.getExtendedVersion() that could return None instead of "0.0.0.0.0". 
git-svn-id: http://munki.googlecode.com/svn/trunk@242 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-01 23:49:20 +00:00
Greg Neagle c200650623 Tweaked munkistatus output. 
git-svn-id: http://munki.googlecode.com/svn/trunk@240 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-09-29 17:51:27 +00:00
Greg Neagle 080ba42ca5 managedsoftwareupdate now records the date and result of the last check in /Library/Preferences/ManagedInstalls.plist. This is used by Managed Software Update.app. 
git-svn-id: http://munki.googlecode.com/svn/trunk@237 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-09-29 17:17:09 +00:00
Greg Neagle 299abe4f1c Flipped the order receipts are checked: we were checking the legacy /Library/Receipts first, then asking pkgutil. Now we go the other way. 
git-svn-id: http://munki.googlecode.com/svn/trunk@236 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-09-28 23:00:01 +00:00
Greg Neagle b3edba0a7a Fixed unicode handling when sending messages to MunkiStatus.app 
git-svn-id: http://munki.googlecode.com/svn/trunk@235 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-09-28 22:58:38 +00:00
Greg Neagle 5a471d591b Removed some temporary testing code. 
git-svn-id: http://munki.googlecode.com/svn/trunk@230 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-09-25 22:48:34 +00:00
Greg Neagle 0a22ae7370 Yet another try to get rid of obsolete directories and files... Grr. 
Also changes to these:
managedsoftwareupdate
   - Changed osascript call to munkicommon
munkilib/installer.py
   - Changed osascript call to munkicommon
   - Changed GUI restart notifcation to use the new munkistatus.restartAlert() call.
munkilib/munkicommon.py
   - Moved osascript function from munkistatus to munkicommon.
munkilib/munkistatus.py
   - Complete rewrite to go with the new MunkiStatus.app 
?\127


git-svn-id: http://munki.googlecode.com/svn/trunk@228 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-09-25 22:25:45 +00:00
Greg Neagle 635895a3b3 Changed processManifestForInstalls() to take an optional list of catalogs to search if the manifest has no list of catalogs. 
git-svn-id: http://munki.googlecode.com/svn/trunk@220 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-09-23 19:02:04 +00:00
Greg Neagle 89d6d06dfe Code cleanup; removing more commented-out code... 
git-svn-id: http://munki.googlecode.com/svn/trunk@219 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-09-17 15:18:02 +00:00
Greg Neagle 7556630385 - Fixed parsing of flat packages so that you can pass relative paths to makepkginfo 
- Changed getBundlePackageInfo() to try to find subpackages and query them directly instead of using info from the .dist file.  This causes different version info to be returned and makes makepkginfo return version info that agrees with what pkgutil on Snow Leopard stores.

git-svn-id: http://munki.googlecode.com/svn/trunk@218 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-09-17 00:09:29 +00:00
Greg Neagle 5ee78c30ef Backed out a change in how updatecheck compared a package to be installed to info retrieved from pkgutil now that I better understand how pkgutil in Snow Leopard stores version info from non-flat packages. 
git-svn-id: http://munki.googlecode.com/svn/trunk@217 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-09-17 00:05:30 +00:00
Greg Neagle b71e17991b Removed commented-out lines as part of a general cleanup. 
git-svn-id: http://munki.googlecode.com/svn/trunk@216 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-09-17 00:03:11 +00:00
Greg Neagle 91cd597322 Removed commented-out lines as part of a general cleanup. 
git-svn-id: http://munki.googlecode.com/svn/trunk@215 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-09-17 00:02:38 +00:00
Greg Neagle 4872ce7776 Removed commented out lines as part of a general cleanup. 
git-svn-id: http://munki.googlecode.com/svn/trunk@214 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-09-17 00:01:37 +00:00
Greg Neagle 681a05e5db Changed getFlatPackageInfo so it looks for a PackageInfo file at the top level of the expanded xar archive. Failing that, it looks for PackageInfo files in embedded sub-packages at the top level of the the expanded xar archive. If that still comes up empty, it tries to get info from the Distribution file at the top level of the expanded xar archive. 
git-svn-id: http://munki.googlecode.com/svn/trunk@212 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-09-15 03:52:01 +00:00
Greg Neagle 97afbb6e5e More unicode fixes. Sigh. 
git-svn-id: http://munki.googlecode.com/svn/trunk@211 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-09-14 23:17:57 +00:00
Greg Neagle d5846a56d8 Changed from #!/usr/bin/env python to #!/usr/bin/python because we need to use Apple's installed Python, and not whatever python the user happens to be using... 
git-svn-id: http://munki.googlecode.com/svn/trunk@210 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-09-14 16:51:53 +00:00
Greg Neagle 75a1f96f9f Changed from #!/usr/bin/env python to #!/usr/bin/python because we need to use Apple's installed Python, and not whatever python the user happens to be using... 
Added support for CFBundleVersion when CFBundleShortVersionString is missing.

git-svn-id: http://munki.googlecode.com/svn/trunk@209 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-09-14 16:51:32 +00:00
Greg Neagle 3af81c7dcf Changed from #!/usr/bin/env python to #!/usr/bin/python because we need to use Apple's installed Python, and not whatever python the user happens to be using... 
git-svn-id: http://munki.googlecode.com/svn/trunk@208 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-09-14 16:50:36 +00:00
Greg Neagle 8c92d2e679 Support for CFBundleVersion if CFBundleShortVersionString is missing. 
git-svn-id: http://munki.googlecode.com/svn/trunk@207 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-09-14 16:50:06 +00:00
Greg Neagle c682eaa717 Changed from #!/usr/bin/env python to #!/usr/bin/python because we need to use Apple's installed Python, and not whatever python the user happens to be using... 
Unicode fixes.

Fixed handling of the install path - some receipts record this with a trailing slash, some do not. If there was no trailing slash, the final filesystem item path was incorrect.

git-svn-id: http://munki.googlecode.com/svn/trunk@206 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-09-14 16:48:50 +00:00
Greg Neagle d3be6d71e6 Changed from #!/usr/bin/env python to #!/usr/bin/python because we need to use Apple's installed Python, and not whatever python the user happens to be using... 
git-svn-id: http://munki.googlecode.com/svn/trunk@205 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-09-14 16:47:09 +00:00
Greg Neagle e91f3a5f67 Changed from #!/usr/bin/env python to #!/usr/bin/python because we need to use Apple's installed Python, and not whatever python the user happens to be using... 
Support for CFBundleVersion when CFBundleShortVersionString is missing.

git-svn-id: http://munki.googlecode.com/svn/trunk@204 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-09-14 16:46:42 +00:00
Greg Neagle 89239f7f14 Changed from #!/usr/bin/env python to #!/usr/bin/python because we need to use Apple's installed Python, and not whatever python the user happens to be using... 
Some unicode fixes.

git-svn-id: http://munki.googlecode.com/svn/trunk@203 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-09-14 16:45:44 +00:00