mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-02-13 10:39:59 -06:00
Code Issues Packages Projects Releases Wiki Activity
765 Commits 11 Branches 115 Tags
b176a55c0d8e970a91dbca243aaab04b5b686c60
Commit Graph

704 Commits

Author SHA1 Message Date
Greg Neagle
b176a55c0d Add support for pre- and postuninstall_script options to makepkginfo. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1191 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-05-24 02:40:26 +00:00
Greg Neagle
da9defca18 Add support for preuninstall_script and postuninstall_script. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1190 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-05-23 21:22:53 +00:00
Greg Neagle
1de09d5117 Better conversion of 'update_for" items from strings to lists of strings if needed. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1189 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-05-20 22:10:49 +00:00
Greg Neagle
8c518912b8 Make updatecheck more forgiving if admin specifies a "requires" or "update_for" key as a string instead of an array of strings. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1188 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-05-20 22:00:53 +00: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
2656d7ab96 MSU.app: Fix for non-visible optional items forgetting their state when "Add or Remove" was clicked when the list was filtered. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1182 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-05-18 15:42:38 +00:00
Greg Neagle
253187fd4c Managed Software Update.app: Add search/filter field to Optional Software view to assist in finding items when there are lots of optional_installs. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1181 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-05-17 23:22:19 +00:00
Greg Neagle
897fd28383 Removed make_munki_pkg* scripts; superseded by make_munki_mpkg* scripts. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1178 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-05-12 17:19:59 +00:00
Greg Neagle
eda80319fb Better parsing of name and version from pkg/dmg names for makepkginfo and munkiimport. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1177 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-05-12 17:06:36 +00:00
Greg Neagle
77bd5fcbe5 Initial code for eventual discovery of apps and other bundles in packages. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1173 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-05-11 15:20:04 +00:00
Greg Neagle
96ee3fa575 When running embedded scripts (preinstall, postinstall, uninstall), pipe STDERR to STDOUT so we can capture all output more easily. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1172 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-05-10 15:23:04 +00:00
Greg Neagle
33b5cd28bb Change choiceIdentifiers in Distribution.dist to more descriptive labels. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1169 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-05-09 15:36:24 +00:00
Greg Neagle
3dce11a31b Expand '~' and '~username' constructions in paths to pre/post/uninstall_scripts. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1166 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-05-06 04:13:09 +00:00
Greg Neagle
02316f0c36 Additional status output when running embedded scripts. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1165 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-05-05 23:11:52 +00:00
Greg Neagle
f6f28d8255 Add: 
--postinstall_script
  --preinstall_script
  --uninstall_script
options to makepkginfo to assist in embedding these kinds of scripts.

git-svn-id: http://munki.googlecode.com/svn/trunk@1164 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-05-05 21:03:17 +00:00
Rob Middleton
7b771b08f2 NO -> objc.NO for 10.5 
git-svn-id: http://munki.googlecode.com/svn/trunk@1157 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-05-03 06:57:56 +00:00
Greg Neagle
eeec63aaa5 Another attempted fix for WebView/WebCore crashing issue. Thx Rob Middleton. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1156 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-05-02 15:27:54 +00:00
Greg Neagle
57fa34e0fe Added blocking_applications to the list of pkginfo keys that get copied from the previous version to a munkiimport of a newer version. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1155 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-04-29 21:41:36 +00:00
Justin McWilliams
820f88f364 Don't crash when calling checkForSoftwareUpdates() on 10.5.x if /System/Library/CoreServices/Software Update.app does not exist. (problem seen in field; likely user deleting it, but unknown at the time). 
Also protect against softwareupdate not existing, or Software Update.app disappearing between stat/chmod and Popen() calls.


git-svn-id: http://munki.googlecode.com/svn/trunk@1153 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-04-27 15:27:36 +00:00
Justin McWilliams
96d117741d Supervisor should exit with the return code of the process it started, not 0 if there are no errors. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1142 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-04-25 20:23:43 +00:00
Justin McWilliams
ab255c82a8 ManagedInstallReport::InstallResults dictionaries now include duration_seconds for each install. This can be sent to reporting servers to keep track of install durations, potentially even averaging durations across a sample size allowing admins to message this in pkginfo descriptions; for example, on Simian this is automatic. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1138 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-04-21 18:35:23 +00:00
Greg Neagle
18af47648e Fix for munkitool_launchd version in metapackage dist file. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1131 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-04-19 17:17:15 +00:00
Greg Neagle
e046baeff4 Still trying to fix pkgtemplate 
git-svn-id: http://munki.googlecode.com/svn/trunk@1130 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-04-19 16:00:13 +00:00
Greg Neagle
a3f1c10747 Still trying to fix pkgtemplate 
git-svn-id: http://munki.googlecode.com/svn/trunk@1129 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-04-19 15:58:51 +00:00
Greg Neagle
96d1c5be19 Still trying to fix pkgtemplate commits 
git-svn-id: http://munki.googlecode.com/svn/trunk@1128 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-04-19 15:50:25 +00:00
Greg Neagle
c3419a0fa2 Attempt to fix earlier botched commit. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1127 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-04-19 15:39:54 +00:00
Greg Neagle
d253ca90a7 Missed commit of pkgtemplate/Resources_admin 
git-svn-id: http://munki.googlecode.com/svn/trunk@1126 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-04-19 15:15:51 +00:00
Greg Neagle
50e05de8d4 New make_munki_mpkg.sh script and pkgtemplate resources. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1122 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-04-18 19:20:18 +00:00
Justin McWilliams
81e560d696 oops, fixing indentation ;/ 
git-svn-id: http://munki.googlecode.com/svn/trunk@1120 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-04-15 21:51:56 +00:00
Justin McWilliams
1687e8be9b Display "Performing postflight tasks...." before running an existing postflight script, to explain the delay between "No changes to managed software are available." and the script exiting. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1119 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-04-15 21:50:18 +00:00
Greg Neagle
10d2532d8b Bumped version number for MSU.app to 3.0.15. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1118 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-04-14 15:14:54 +00:00
Greg Neagle
60f38d0fde Attempt at fix for WebKitView crashing issue. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1117 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-04-14 15:11:18 +00:00
Greg Neagle
7fdaa2ad53 Updated warning message when processing removals and item info cannot be found to match the warnings given when processing installs and updates. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1116 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-04-13 22:39:51 +00:00
Justin McWilliams
4046754270 Merge supervisor branch (r1110, r1111, r1114) into trunk. 
Summary:
- wrap entire managedsoftwareupdate execution and kill if open for 12 hours.
- move "delay/sleep" logic into supervisor, removing need for updatecheckhelper (but keep updatecheckhelper around so clients continue to work without reloading launchd)


git-svn-id: http://munki.googlecode.com/svn/trunk@1115 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-04-13 21:57:02 +00:00
Justin McWilliams
86fff493d3 pythonScriptRunning() should only find python processes where the script running (first arg) is <scriptname>, not processes where <scriptname> exists anywhere in the argument list. 
Example, where <scriptname> == 'managedsoftwareupdate':
  Still find: /usr/bin/python managedsoftwareupdate
  Don't find: /usr/bin/python foo.py --argbar managedsoftwareupdate


git-svn-id: http://munki.googlecode.com/svn/trunk@1109 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-04-11 22:58:24 +00:00
Justin McWilliams
4c31fdaf81 Merge r1107 into trunk, adding timeout to installer executions to self-heal from hung installs (as seen with Apple SUS updates for iTunes and Java on 10.5.x). 
git-svn-id: http://munki.googlecode.com/svn/trunk@1108 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-04-11 22:44:24 +00:00
Greg Neagle
80c7bd1243 updatecheck.fileSystemItemExists(item) now returns true when given a path to a symlink if the symlink exists but the item it points to does not. Previously it returned false if the target was missing. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1105 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-04-11 18:18:13 +00:00
Justin McWilliams
f17935640c Enhancement of r1103, cleaning up how getIdleSeconds() works. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1104 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-04-11 15:32:13 +00:00
Justin McWilliams
53d16dd778 Fix but in getIdleSeconds() where ioreg output is split, but there are inconsistent number of whitespaces. 
I ran into a machine where "parts" was:  ['|', '|', '"HIDIdleTime"', '=', '1458195167613966'], and since parts[3] is "=" getIdleSeconds() was crashing trying to convert it to int().

So return int(int(parts[3])/1000000000) should really be parts[4] on this machine, but this may be inconsistent on different machines?

# /usr/sbin/ioreg -c IOHIDSystem -d 4 | grep Idle
   | |     "HIDIdleTime" = 1458351496253133

So let's just use regex to parse the integer out of the line more safely.



git-svn-id: http://munki.googlecode.com/svn/trunk@1103 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-04-09 15:10:46 +00:00
Justin McWilliams
c0a9403e63 Syntax fix for r1098. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1102 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-04-08 17:59:31 +00:00
Greg Neagle
d4261af782 munkiimport will copy the old forced_install and forced_uninstall keys as well as the new unattended_* keys to improve backwards compatibility. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1101 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-04-08 17:12:38 +00:00
Greg Neagle
c0c0e2604c updatecheck now recognizes "forced_install" as a synonym for "unattended_install" and "forced_uninstall" as a synonym for "unattended_uninstall". 
git-svn-id: http://munki.googlecode.com/svn/trunk@1100 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-04-08 17:03:54 +00:00
Justin McWilliams
e84453eb5f s/forced_(un)install/unattended_(un)install/g 
s/only_forced/only_unattended/g

Change forced_* pkginfo key names to more accurately describe what's happening, since they're not "forced" in the true sense of the word.

Admins should include both forced_* and unattended_* keys in their pkginfos while migrating to client releases after this change, to ensure both old and new clients have desired pkg push agressiveness :(


git-svn-id: http://munki.googlecode.com/svn/trunk@1098 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-04-08 16:23:45 +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
Justin McWilliams
b20b212431 Fix utils.runExternalScript docstring to match change in r1092. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1093 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-04-04 21:39:42 +00:00
Justin McWilliams
3f3a3b4dfd utils.runExternalScript should return stderr, and preflight/postflight stderr should be displayed and logged if return != 0 
git-svn-id: http://munki.googlecode.com/svn/trunk@1092 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-04-04 21:38:33 +00:00
Greg Neagle
86d1780667 Clean up catalog files that are no longer in use by the client. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1091 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-04-01 15:31:16 +00:00
John Randolph
b04cce845d add missing exception FileCopyError 
git-svn-id: http://munki.googlecode.com/svn/trunk@1085 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-03-23 15:28:43 +00:00
John Randolph
b6cb650938 add 
--applesuspkgsonly
--munkipkgsonly

options to managedsoftwareupdate to override which packages it looks at



git-svn-id: http://munki.googlecode.com/svn/trunk@1084 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-03-22 22:00:49 +00:00