Commit Graph

2545 Commits

Author SHA1 Message Date
Greg Neagle e31330a64c String interpolation fix 2025-02-07 08:07:55 -08:00
Greg Neagle 0a2cb3f524 Don't skip user notification for display sleep assertions if force is true (so notifications will happen if a force install deadline is soon) 2025-02-06 17:33:52 -08:00
Greg Neagle f88d10eaef Skip user notification if a process has made a display sleep assertion, which may mean the user is 'presenting' or in a meeting 2025-02-06 17:17:18 -08:00
Greg Neagle 41e4a5cf89 Wait longer for a reponse from fdesetup so the client doesn't timeout too fast 2025-01-29 13:38:15 -08:00
Greg Neagle b720ed5e59 Bump version for future release 2025-01-29 08:20:10 -08:00
Greg Neagle 6b4ad647c4 Update copyright dates 2025-01-25 15:35:09 -08:00
Greg Neagle 40b44aef2a Test that /usr/bin/aa exists before attempting to call it, avoiding a crash on older macOSes 2025-01-17 10:53:19 -08:00
Greg Neagle aa41b00217 Bump version for future release 2024-10-07 09:28:31 -07:00
Greg Neagle 85e82c68c7 iconutils: if pax can't expand files from a package Payload archive, try aa 2024-09-20 11:28:38 -07:00
Greg Neagle 93b26403d1 When processing optional_installs, correctly record installed_size if available instead of just duplicating installer_item_size 2024-09-05 11:56:47 -07:00
Greg Neagle f0b2f9756e Bump version.plist for future release 2024-09-05 10:06:15 -07:00
Greg Neagle ee5d52442b Add softwareupdate catalog for macOS 15 2024-08-29 15:01:06 -07:00
Greg Neagle 7756827e40 Update selfservice.py
Fix an error message that would have provided wrong info
2024-08-20 10:07:01 -07:00
Greg Neagle eff2ebc2c9 Bump version.plist for future release 2024-08-14 08:45:58 -07:00
Graham Gilbert 752376875c Add --show-config-plist option (#1224) 2024-08-14 08:24:21 -07:00
Greg Neagle 85f39b76d0 Merge branch 'Munki6dev' into macmule-installhelper 2024-07-01 09:47:26 -07:00
Greg Neagle dd80a61875 Merge branch 'main' into Munki6dev 2024-07-01 09:46:11 -07:00
aysiu cccfba0500 Display force_install_after_date in managedsoftwareupdate summary (if applicable) (#1220)
* Show force_install_after_date in summary after managedsoftwareupdate run
---------

Authored-by: Alan Siu <alanysiu@gmail.com>
2024-07-01 09:44:47 -07:00
Greg Neagle d7a27ea4fd Bump version for future release 2024-06-24 10:51:29 -07:00
Greg Neagle 251c1ce3b8 Merge branch 'Munki6dev' into macmule-installhelper 2024-06-24 10:50:16 -07:00
Greg Neagle 34b9e28e2a Merge branch 'main' into Munki6dev 2024-06-24 10:47:46 -07:00
Greg Neagle 40cc0ef8f9 Add version info to welcome message (#1219) 2024-06-24 10:46:35 -07:00
Greg Neagle 793e468b87 Bump version.plist for future release 2024-06-04 13:41:34 -07:00
Greg Neagle 23a6344c95 Merge branch 'Munki6dev' into macmule-installhelper 2024-06-04 13:40:47 -07:00
Greg Neagle 6c4a8bc29f Restore 'catalogs' as an item included in ManagedInstallReport.plist under 'Conditions'. Addresses #1218 2024-06-04 13:39:24 -07:00
Greg Neagle bb2d1e0ca2 When running an embedded pkginfo script, ignore errors when converting script output to UTF-8 2024-06-03 09:03:01 -07:00
Greg Neagle 3c4368c208 Merge branch 'Munki6dev' into macmule-installhelper 2024-05-21 15:20:43 -07:00
Greg Neagle fbe22d2ce1 Fix so new conditional/predicate comparisons based on installed applications actually work.
Bump version to 6.5.1 for future release.
2024-05-21 15:17:07 -07:00
Greg Neagle 14256fc454 Bumping version for future release 2024-05-02 08:06:18 -07:00
macmule d746c046cb Changes made to installhelper and make_munki_pkg.sh (#1216)
* 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)

* Corrections to installhelper

* Update installhelper

---------

Co-authored-by: Greg Neagle <Gregneagle@mac.com>
2024-05-02 08:04:22 -07:00
Greg Neagle ab341ea99b Merge branch 'Munki6dev' into macmule-installhelper 2024-04-18 15:27:12 -07:00
Greg Neagle 6bb572b148 Add more detail to warning message when failing to import a middleware file 2024-04-17 08:56:01 -07:00
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