Commit Graph

3325 Commits

Author SHA1 Message Date
Greg Neagle 29f86e82a5 Merge branch 'Munki5dev' into bigsur-profiles 2020-09-28 15:49:48 -07:00
Greg Neagle d2ed38e3be Better logic for parsing percent-done output from Big Sur's softwareupdate -- this time with the right characters 2020-09-27 14:29:21 -07:00
Greg Neagle aea9ffd3e8 Better logic for parsing percent-done output from Big Sur's softwareupdate 2020-09-27 14:27:33 -07:00
Greg Neagle 6d43e98130 Tweak percent-done output parsing on Big Sur 2020-09-17 16:15:12 -07:00
Greg Neagle 4328067362 Merge branch 'Munki5dev' into bigsur-profiles 2020-09-16 14:47:07 -07:00
Graham Gilbert 401f521f48 Add cleanup scripts (#1025)
* Run cleanup scripts if they're there

* Cleanup script, add to build script

* okay

* I'm all shelled out

* Comment for future greg
2020-09-16 14:05:08 -07:00
Greg Neagle c27fd3c07f Logic change to get the Python revision number to increment 'better' 2020-09-15 17:08:33 -07:00
Greg Neagle e1b5d505bc Revert "Revert "munki: rename "/usr/local/munki/python" symlink to "munki-python" (#997)""
IOW, restore the rename of "/usr/local/munki/python" symlink to "munki-python" (#997)

This reverts commit b9f9fffccc.
2020-09-15 16:46:34 -07:00
Greg Neagle aa66b4cda5 Don't do any attempted cleanup of the Python framework so that Munki-driven updates of Munki don't crash mid-upgrade 2020-09-15 14:54:37 -07:00
Greg Neagle d03ef108d7 Merge branch 'Munki5dev' into bigsur-profiles 2020-09-15 09:07:38 -07:00
Greg Neagle b9f9fffccc Revert "munki: rename "/usr/local/munki/python" symlink to "munki-python" (#997)"
This change is still a good future goal, but is causing problems that are too difficult to work around right now and is delaying the vital release of Munki 5.1 for Big Sur compatibility.

This reverts commit 3bb91cabca.
2020-09-15 09:04:47 -07:00
Greg Neagle 0ea8f2a8e3 Merge branch 'Munki5dev' into bigsur-profiles 2020-09-14 13:20:53 -07:00
Greg Neagle a7b1df2a80 Merge branch 'Munki5dev' into bigsur-profiles 2020-09-04 16:30:10 -07:00
Greg Neagle f2e5845f37 Merge branch 'Munki5dev' into newbuildscript 2020-09-04 16:29:30 -07:00
Greg Neagle 696e40ca8a More changes to support softwareupdate in Big Sur 2020-09-04 16:28:53 -07:00
Greg Neagle 43ff437a90 Merge branch 'Munki5dev' into newbuildscript 2020-09-04 08:29:28 -07:00
Greg Neagle 9b3240895d Merge branch 'Munki5dev' into bigsur-profiles 2020-09-04 08:28:52 -07:00
Greg Neagle a840bed778 Add default sucatalog for Big Sur 2020-09-04 08:28:15 -07:00
Greg Neagle d1db5af686 Support for Big Sur softwareupdate percent-done feedback 2020-09-04 08:22:43 -07:00
eholtam 0e14dccdb1 Removed detection of absolute path (#1016)
* Removed detection of absolute path. It paths wrong if the supplied file is not in the cwd.

* Convert supplied config file to an absolute path and use that variable for all references to the file.

Co-authored-by: eholtam <(none)>
2020-09-03 15:48:02 -07:00
Greg Neagle cfe2702ae2 Fix for problem items also showing up in pending items 2020-09-02 16:29:12 -07:00
Greg Neagle 85dde11196 Better processing of addditional options to make_munki_mpkg.sh 2020-08-25 08:40:32 -07:00
Greg Neagle 1399cfa839 Merge branch 'newbuildscript' of https://github.com/munki/munki into newbuildscript 2020-08-24 21:06:30 -07:00
Marnin ee755fe295 Fixed minor typos (#1015)
* Fixed minor typo

* Fixed minor typo
2020-08-24 19:20:20 -07:00
Greg Neagle 45ec30f7b9 Fix for default output dir 2020-08-24 13:43:22 -07:00
Greg Neagle d2bd952f00 Merge branch 'Munki5dev' into bigsur-profiles 2020-08-24 12:17:14 -07:00
Greg Neagle 614fd67f33 Merge branch 'Munki5dev' into newbuildscript 2020-08-24 12:16:52 -07:00
Greg Neagle c346a2833d Add better requirements for 10.15 and 11.0 installs when a pkginfo is generated 2020-08-24 12:16:05 -07:00
Greg Neagle aa91e5a7a7 Tweak help text 2020-08-24 08:54:16 -07:00
Greg Neagle d5474f9271 Tweak help text 2020-08-23 18:49:06 -07:00
Greg Neagle 631095fc78 Tweak help text 2020-08-23 18:34:01 -07:00
Greg Neagle b39b5b8c20 Update make_munki_mpkg_from_git.sh to reflect changes in make_munki_mpkg.sh 2020-08-23 18:32:41 -07:00
Greg Neagle e7b688dc66 Add support for building a config pkg from a preferences plist 2020-08-23 18:31:51 -07:00
Greg Neagle a7d097291e Remove unsupported make_munki_mpkg_DEP.sh script. 2020-08-23 14:13:31 -07:00
Greg Neagle ff9b98d783 Add support for bootstrap pkg 2020-08-23 14:12:21 -07:00
Greg Neagle 03c822ece2 Move pkg scripts into code/tools/pkgresources 2020-08-22 15:33:38 -07:00
Greg Neagle 48e457c33d Remove no-longer-used file 2020-08-22 15:28:06 -07:00
Greg Neagle 1a54a675e0 Missed a pkg naming format change 2020-08-22 15:11:27 -07:00
Greg Neagle 37fc16bfdf Simplify some of the pkg creation tasks in make_munki_mpkg.sh; add git revision count to python pkg version 2020-08-22 13:41:41 -07:00
Greg Neagle b573ee66cb Incorporate 'DEP' functionality into make_munki_mpkg.sh 2020-08-22 11:32:34 -07:00
Greg Neagle a877889b1c Merge branch 'Munki5dev' into bigsur-profiles 2020-08-18 16:20:04 -07:00
Taylor Boyko b56fb552b4 Support repo-based makecatalogs (#1012)
* if repo plugin has a makecatalogs method defined, use it instead

* pass options and output_fn to repo makecatalogs method
2020-08-18 16:17:12 -07:00
Greg Neagle 7b372913ab Merge branch 'Munki5dev' into bigsur-profiles 2020-08-10 10:42:21 -07:00
Greg Neagle 19b5555d7e Add postinstall script to Python pkg that removes older versions from the framework and ensures the python symlink is removed. Addresses #1010" 2020-08-10 10:41:17 -07:00
Greg Neagle 0176fef862 Merge branch 'Munki5dev' into bigsur-profiles 2020-08-08 07:47:42 -07:00
Greg Neagle a60e90d5a8 Workaround to reliably get 'real' OS version on Big Sur. Addresses #1009 2020-08-08 07:46:40 -07:00
Greg Neagle b7082c2ac1 Merge branch 'Munki5dev' into bigsur-profiles 2020-08-07 20:19:15 -07:00
Greg Neagle c5fc0b7673 Remove message about a short delay at the loginwindow when prompting for a logout or restart -- it's no longer needed 2020-08-07 20:18:40 -07:00
Greg Neagle bee2216e8d Remove most subprocess bufsize and open buffering options to instead use defaults. Addresses several RuntimeWarnings when using Python 3.8. 2020-08-06 21:34:43 -07:00
Greg Neagle 6d05eedbee Merge branch 'Munki5dev' into bigsur-profiles 2020-08-04 21:31:16 -07:00