Commit Graph

2513 Commits

Author SHA1 Message Date
Greg Neagle 16320e56ae Merge branch 'Munki6dev' into macmule-installhelper 2024-04-15 08:40:17 -07:00
Greg Neagle aeac6e96a9 Start consolidating functions that deal with date/times and rely less on undocumented pyObjc conversions 2024-04-12 13:56:11 -07:00
Greg Neagle a222d0739d Merge branch 'Munki6dev' into macmule-installhelper 2024-04-10 09:44:39 -07:00
Greg Neagle 2edea029eb Fix string format error for new package references messages 2024-04-10 09:31:06 -07:00
Greg Neagle b4265aa7fc Merge branch 'Munki6dev' into macmule-installhelper 2024-04-01 10:58:12 -07:00
Greg Neagle c9e3250859 Improved debug warnings when attempting to find a valid uninstall method for an item 2024-04-01 10:57:21 -07:00
Steve af4296d50e manifest delete option added (#1212)
Co-authored-by: Steve Kueng <steve.kueng@umb.ch>
2024-04-01 10:53:46 -07:00
macmule 183005ea6d Macmule installhelper (#1210)
* Update installhelper

• Amended the user bootout and bootstrap commands to not be ran via `launchctl asuser`

* Update MainMenu.xib

• Centered the MunkiStatus.app window icon
• Changed the icon from AppIcon to NSApplicationIcon (which then allows for changing the icon via NSWorkspace's setIcon)
2024-04-01 10:09:13 -07:00
macmule dc2725e4e7 Relocate MunkiStatus.app and Munki-notifier.app to ../Contents/Helpers/ from ../Contents/Resources/ - Munki6dev base (#1207)
* Relocate MunkiStatus.app and Munki-notifier.app to ../Contents/Helpers/ from ../Contents/Resources/

- Updated location of munki-notifier in code/apps/Managed Software Center/Managed Software Center/Controllers/MainWindowController.swift
- Added code/client/installhelper script
- Amended code/tools/make_munki_mpkg.sh with new locations for munki-notifier and MunkiStatus as well as changes required to leverage `installhelper`
- Amended code/tools/pkgresources/Scripts_app_usage/postinstall to leverage `installhelper`
- Deleted code/tools/pkgresources/Scripts_app_usage/preinstall as the actions within should be handled now by `installhelper`
- Amended code/tools/pkgresources/Scripts_launchd/postinstall to leverage `installhelper`
- Amended launchd/LaunchAgents/com.googlecode.munki.munki-notifier.plist to use the new path to munki-notifier.app
- Amended launchd/LaunchAgents/com.googlecode.munki.MunkiStatus.plist to use the new path to MunkiStatus.app

This is a resubmission of https://github.com/munki/munki/pull/1203, which needed it's base branch changing from `main` to `Munki6dev`

* Update installhelper

 - Removed CHECK_TIME global - https://github.com/munki/munki/pull/1207/files/374fbaf9220144740d0d0cef5acba20fd6ac554a#r1515000516
- Remove erroneous login window comments - https://github.com/munki/munki/pull/1207/files/374fbaf9220144740d0d0cef5acba20fd6ac554a#r1515006835 and https://github.com/munki/munki/pull/1207/files/374fbaf9220144740d0d0cef5acba20fd6ac554a#r1515006962
- Simplified IF condition - https://github.com/munki/munki/pull/1207/files/374fbaf9220144740d0d0cef5acba20fd6ac554a#r1515005565 this was in place incase LimitLoadToSessionType contained multiple values (as it can).

* Update installhelper

- Reverted changes made for - https://github.com/munki/munki/pull/1207/commits/374fbaf9220144740d0d0cef5acba20fd6ac554a#r1515005565
- Changed constant/global PASSED_ARG to local: launchd_group - https://github.com/munki/munki/pull/1207#discussion_r1515002646 and https://github.com/munki/munki/pull/1207#discussion_r1515002968

* Update installhelper

* Update installhelper

* Update installhelper

* Update installhelper

* Update make_munki_mpkg.sh

Amended so that the launchd pkg is installed by default
2024-03-26 11:04:26 -07:00
Greg Neagle 29fd72a80c Fix for deprecation messages new in macOS 14.4 that corrupt installer output 2024-03-22 10:35:27 -07:00
Greg Neagle bf1ce5a3d1 Add support for installed application info for conditional expressions 2024-03-02 11:31:26 -08:00
Greg Neagle 45b7ac64e7 Print additional info when an item cannot be removed because all its pkgs are shared with other items 2024-02-29 11:17:10 -08:00
Greg Neagle 18ea6c42ca Tweaks around behvaiors with requires dependencies that cannot be resolved, and how they interact with autoremove 2024-02-29 10:52:21 -08:00
Greg Neagle 36769cdbbc Revert "Change all shebangs in prep for Python 3.12 (where symlinks to the Python executable are broken)"
This reverts commit fdec07b615.
2024-02-23 10:49:00 -08:00
Greg Neagle 64dea93562 Update version for future release 2024-02-23 09:05:54 -08:00
Greg Neagle fdec07b615 Change all shebangs in prep for Python 3.12 (where symlinks to the Python executable are broken) 2024-02-23 09:05:16 -08:00
Greg Neagle 1850dbe077 Replace use of deprecated imp module with importlib.util for middleware and repo plugins 2024-02-20 10:46:32 -08:00
Greg Neagle 2b327569b4 Update copyright dates 2024-01-30 16:14:29 -08:00
Greg Neagle 98863a7206 Bump version for future release 2024-01-30 08:52:40 -08:00
Greg Neagle 8edfc6a825 Rename 'board-id' and 'device-id' 'facts' to 'board_id' and 'device_id, respectively. (Hyphens appear to be illegal in attribute names in NSPredicate expressions). Thanks to @mattydee99. See issue #1201. 2024-01-24 14:39:06 -08:00
Greg Neagle dd74af60b1 More gracefully handle exceptions when evaluating a predicate (used in conditional_items and installable_condition). Thanks to @mattydee99. See issue #1201 2024-01-24 14:33:17 -08:00
Greg Neagle 8aab28f37f Bumping version for future release 2024-01-17 16:53:29 -08:00
Patrick Gallagher 4754ecc960 Add preference to ignore middleware (#1194)
* Add preference to ignore middleware

* Changed to suggested more pythonic code
2024-01-17 15:51:44 -08:00
Greg Neagle 5d5d8adcee Return an error from updatecheck.check() when we can't download the primary manifest 2024-01-17 09:36:39 -08:00
Greg Neagle 262ef188ec Bump munki version for future release 2024-01-02 11:54:10 -08:00
Greg Neagle 150418ff4e Fix names of board-id and device-id attributes 2023-12-07 15:42:06 -08:00
Greg Neagle c3846fd24a Refine generated installable_condition predicate 2023-12-07 15:39:45 -08:00
Greg Neagle 350b92ce33 Add experimental support for getting supported hardware for a given macOS installer 2023-12-07 15:30:50 -08:00
Greg Neagle 4f8ba52eee Collect board-id or device-id if available and add to Condtions dict for use in conditional_items, etc 2023-12-07 09:38:56 -08:00
Greg Neagle b0abcabff5 Bump version for future release 2023-12-05 08:57:16 -08:00
Greg Neagle 8134cedbc2 Address issue parsing bundle-style distribution packages introduced here: https://github.com/munki/munki/commit/21a6a4d3a5c8dbe0aeda964e99d4824dad721be0 2023-11-27 09:03:17 -08:00
Greg Neagle 4a91b1d978 Fix for "KeyError: 'AdobeCode'" when importing some older Adobe pkgs 2023-11-22 09:32:13 -08:00
Greg Neagle 9ba39afe2b Address #1188 and #1104. Better handling of dependencies/requirements when a required item fails to download, but is also required by other items. 2023-11-20 11:53:30 -08:00
Greg Neagle 4d4b759b5c Fomatting tweak 2023-11-20 09:56:34 -08:00
Greg Neagle 3b6aa2173d When creating pkginfo, if an uninstall_script or uninstall_method is specified, also get uninstallable to True. Fixes #950 and #1160. 2023-11-20 09:55:25 -08:00
Greg Neagle bd42ba7dea Restore the sleep time to 5 seconds after triggering munki-notifier 2023-11-16 18:05:10 -08:00
Greg Neagle a03b3ba425 Bump version for future release 2023-11-16 14:24:20 -08:00
Greg Neagle 2f5286aabb Work around an issue where munki-notifier is not always triggered when it should be.
A specific instance is when MSC.app is already open and in the background; for some reason
the launchagent takes longer to actually launch munki-notifier.
2023-11-16 14:12:55 -08:00
Greg Neagle efeca8e0fc Change 'touch' operation to use binary flag for consistency 2023-11-16 14:10:28 -08:00
Greg Neagle 9e6da575c3 pylint cleanups 2023-11-10 14:08:27 -08:00
Greg Neagle 6cf8c03d98 Ensure the list of applications to check if running does not include any None items 2023-11-10 13:28:12 -08:00
Greg Neagle 4a1a4849f5 Bump version.plist for future release 2023-11-02 16:01:59 -07:00
Greg Neagle 54a85fbd61 Check for valid _package_ extension (not installer item extension) when attempting to get metadata for a package. 2023-09-15 14:00:34 -07:00
Greg Neagle bb77913dbf makepkginfo help message tweaks 2023-08-18 09:26:22 -07:00
Greg Neagle d3c9eb4ffc Bumping version for future release 2023-08-01 16:44:10 -07:00
Shea Craig 3172d5dbb2 Fix #1183 (#1184)
* Use PyObjC recommended pattern to call superclass init to fix #1183

* Use the pylint comments from gurl.
2023-07-26 14:07:38 -07:00
Nick McSpadden 2d64dcd17a Munkiimport puts supported architecture into pkginfo filename (#1185)
* Munkiimport now puts arch into pkginfo filename
2023-07-24 11:36:39 -07:00
Scott Blake b697f04f4b Set consoleuser and thisuser to lowercase (#1182) 2023-07-17 09:13:03 -07:00
Greg Neagle 6591df346f Add Sonoma CatalogURL 2023-06-27 11:45:55 -07:00
Greg Neagle 8dbcecd61e minor pylint tweaks 2023-06-27 11:45:17 -07:00