Commit Graph

87 Commits

Author SHA1 Message Date
Greg Neagle 9a3cff59f5 Remove strange extra characters that got inserted 2016-09-22 17:36:06 -07:00
Greg Neagle e1983a19b4 Attempt to provide some progress feedback when installing/removing Adobe CC 2015.X products using the new HD format. 2016-09-22 17:17:46 -07:00
Timothy Sutton 7a7fa3d47d lint fixes 2016-08-12 11:45:46 -04:00
Timothy Sutton 6481335929 Also retrieve BaseVersion and version from Application.json
- may be helpful to have more data available if needed later
2016-08-12 11:39:41 -04:00
Timothy Sutton 0e942ce45f Filter out non-HD installers when searching for prodVersion metadata 2016-08-12 11:39:02 -04:00
Timothy Sutton aabc0ea205 Retrieve SAPCode key in optionXML.xml for both RIBS and HD
- so that we have this key regardless of RIBS and HD installers
- fixes #649
2016-08-12 09:56:23 -04:00
Timothy Sutton 1cfb4249bc Fix wrong uninstallXML info generated for new "updated" HD installers
- Use `prodVersion` from optionXML.xml instead of `ProductVersion` from Application.json
2016-08-04 16:58:26 -04:00
Timothy Sutton c03bb70f7e Fix PEP8 errors for #641 2016-08-03 10:54:52 -04:00
Timothy Sutton 4c9b1e5c86 Always define 'installs' for Adobe CS/CC packages
- fix crash importing a CCP pkg containing only Acrobat Pro DC, which doesn't currently generate any installs items
2016-07-27 20:28:33 -04:00
Timothy Sutton 07476adaf2 Set display_name and version pkginfo keys for Adobe HD if appropriate
- if we have a CCP package with one HD app, set its `version` and `display_name`keys since we've already extracted these
2016-07-27 20:28:33 -04:00
Timothy Sutton 879339a7ad Don't assume all CC HD packages have a 'Type' key 2016-07-27 20:28:33 -04:00
Timothy Sutton ff374b176e Generate installs items for RIBS and HD in the same code section
- we need to create an installs array for either installs type but we can have any combination of the two, so create it up front so ordering doesn't matter
2016-07-27 20:28:33 -04:00
Timothy Sutton c665a243f6 Don't assume 'MediaType' key for each product in parsed optionXML.xml 2016-07-27 20:28:33 -04:00
Timothy Sutton 2d664a6b33 Initial support for creating .pimx installs items for HD installers 2016-07-27 20:28:33 -04:00
Greg Neagle 12d4f0d27e Update copyright info on files; remove abandoned tools from code/tools 2016-03-15 09:32:28 -07:00
Samuel Keeley 5c12185da4 Replace http://www.apache.org/licenses/LICENSE-2.0 with https://www.apache.org/licenses/LICENSE-2.0 2015-11-13 20:35:24 -08:00
Greg Neagle 441e649288 take out another instance of 'launchctl bsexec' usage under 10.11 2015-07-14 13:44:15 -07:00
Greg Neagle 6f3b65feac Don't use under 10.11 since SIP prevents it from doing what we want 2015-07-14 13:39:49 -07:00
Greg Neagle a6955fd0d4 Initial explict support for Adobe CCP packages. Use to import a CCP installer and uninstaller. 2014-11-03 14:01:20 -08:00
Greg Neagle 7fd3512552 PyLint cleanups 2014-10-27 09:55:17 -07:00
Greg Neagle 423ec8b790 PyLint cleanup: replace all unused_foo variables with dummy_foo variables to make PyLint happy 2014-10-26 11:42:33 -07:00
Greg Neagle 564e4ac368 Change munkicommon.tmpdir to a function so that importing munkicommon does not create orphaned munki-foo directories in /tmp 2014-10-25 10:06:37 -07:00
Pepijn Bruienne c76fc99d6d Add entry to catch SwitchBoard.app in killStupidProcesses
The existing entry to kill off SwitchBoard.app being launched in the loginwindow context did not always work. Adding "/bin/bash /Library/Application Support/Adobe/SwitchBoard/SwitchBoard.app/Contents/MacOS/switchboard.sh" resolves this issue.
2014-09-26 12:55:47 -04:00
Greg Neagle 769e4a930f Remove trailing whitespace from all lines in adobeutils.py, iconutils.py, launchd.py, munkistatus.py, updatecheck.py (code style issue) 2014-07-22 10:32:02 -07:00
Greg Neagle fddd138000 Bumping version to 1.0.0. Updated copyright dates. 2014-01-10 08:20:15 -08:00
Greg Neagle 5beb7c85b3 in adobeutils.getPayloadInfo() handle the case of no xml and no .db 2013-08-20 11:13:48 -07:00
Timothy Sutton cc552795ad Clean up Media_db.db sqlite query. 2013-07-01 14:56:23 -04:00
Timothy Sutton 4a8e44bb51 adobeutils.py: Support new Adobe CC updaters with only Media_db.db in payload folders. 2013-07-01 14:38:37 -04:00
Greg Neagle 5aff95e9cd Support for installing AAMEE/CCP packages that include updates. 2013-05-17 10:20:28 -07:00
Greg Neagle f848fb744d Patch to adobeutils.py from Pepijn Bruienne <bruienne@gmail.com> to allow makepkginfo to properly parse an Adobe Creative Cloud product package built with Creative Cloud Packager. 2013-05-10 16:19:49 -07:00
Greg Neagle 4b71ace130 Updated copyright info on all files with copyright info. 2013-01-28 11:55:09 -08:00
Justin McWilliams ba6588acdd Force Munki to obtain temp directories within /tmp, to avoid rare, intermittent issue where tempfile.mkdtemp() would choose to create a temp dir on an NFS path, such as /home/<username>/tmp/, causing Munki to crash when attempting to chown/etc. 2013-01-09 17:32:31 -05:00
Greg Neagle 61738f6712 Change messsage displayed when running an Adobe CS5 install since CS6 installs use the same code 2012-05-31 11:26:14 -07:00
Justin McWilliams 89e2ab8b81 Move getPIDforProcessName() out of munkicommon and into utils, so it can be
used in modules that munkicommon also imports.
2012-02-10 18:05:51 -05:00
Greg Neagle 05e6aa57e9 Adobe CS4 installs now attempt to kill stalled Adobe AIR processes, just like CS5 installs. This allows installs at the loginwindow to succeed. 2012-02-09 08:28:21 -08:00
Greg Neagle 02a8b0cfc6 Move getPIDforProcessName into munkicommon for use by both munkistatus and adobeutils 2012-02-04 12:13:46 -08:00
Greg Neagle c916885e03 Added munkicommon.display_status_major and renamed munkicommon.display_status to munkicommon.display_status_minor; changes to more closely map the munkistatus-style output to the stdout-style output 2011-12-21 11:28:52 -08:00
MagerValp 986a45d395 Reverting r1186, library files don't require executable bit.
git-svn-id: http://munki.googlecode.com/svn/trunk@1187 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2011-05-20 13:35:09 +00:00
MagerValp c3fb0ff0ec Fixed missing executable bit.
git-svn-id: http://munki.googlecode.com/svn/trunk@1186 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2011-05-20 09:31:24 +00:00
Greg Neagle 1c9e5784c1 - forced_installs and forced_uninstalls now work with items that are part of a dependency relationship
- makecatalogs now has no OS X-specific dependencies

- munkiimport fixes for repos hosted via SMB/CIFS.

git-svn-id: http://munki.googlecode.com/svn/trunk@1097 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2011-04-06 21:54:29 +00:00
Greg Neagle 69705bb33e Change version number handling to eliminate padding/truncating version numbers to five positions (ala 1.0.0.0.0).
git-svn-id: http://munki.googlecode.com/svn/trunk@1016 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2011-01-31 21:38:47 +00:00
Greg Neagle a853f78c9f Update copyright dates across the board.
git-svn-id: http://munki.googlecode.com/svn/trunk@1010 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2011-01-25 18:22:14 +00:00
John Randolph ffe6722d87 wrap os.listdir() to decode utf-8 unicode into unicode objects
change all code locations using os.listdir() to use munkicommon.listdir()



git-svn-id: http://munki.googlecode.com/svn/trunk@941 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-11-30 16:28:45 +00:00
Greg Neagle b52f45cdf0 More print statement cleanup.
git-svn-id: http://munki.googlecode.com/svn/trunk@821 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-10-19 17:22:55 +00:00
Greg Neagle efdd7628bd Changed munkicommon.getAppData() to use LaunchServices instead of Apple System Profiler. LaunchServices is faster and returns more apps than System Profiler, especially on Leopard systems. Thanks to John Randolph.
git-svn-id: http://munki.googlecode.com/svn/trunk@787 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-10-13 17:32:53 +00:00
Greg Neagle 4d9af60e5a updateAcrobatPro: when looking for the apps to update, first look in /Applications/Adobe Acrobat 9 Pro/ before asking system_profiler to search.
git-svn-id: http://munki.googlecode.com/svn/trunk@782 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-10-07 18:34:44 +00:00
Greg Neagle 1dab884671 Replace separate instances of getAppData() in adobeutils.py and updatecheck.py with a single implementation in munkicommon.
git-svn-id: http://munki.googlecode.com/svn/trunk@781 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-10-07 18:07:50 +00:00
Greg Neagle 6aaddbfe7f Attempt to be a little smarter about which payloads we add to the installs list for Adobe CS5 updaters when generating pkginfo. Now we look for a payload whose name matches that of the overall update and add only that payload if it exists, falling back to the previous behavior if it does not.
git-svn-id: http://munki.googlecode.com/svn/trunk@779 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-10-06 18:19:32 +00:00
Greg Neagle eceedc0e86 pylint cleanups: mark unused variables.
git-svn-id: http://munki.googlecode.com/svn/trunk@749 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-09-13 17:34:47 +00:00
Greg Neagle b742e4fbb0 Changed she-bang to #!/usr/bin/python since we require Apple's included python, not just any python the user may have installed.
git-svn-id: http://munki.googlecode.com/svn/trunk@721 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-09-03 21:37:37 +00:00