mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-04-25 14:29:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
4,529 Commits 9 Branches 119 Tags
2b1fba27f99dbc272ecedd9856566308a4554be6
Commit Graph

29 Commits

Author SHA1 Message Date
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
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 bf91a80072 Modernize launchctl syntax for launchd pkg postinstall; load authrestartd daemon 2024-03-03 19:47:56 -08:00
Greg Neagle 47992f885b Switch app_usage pkg scripts to /bin/sh from /bin/bash 2024-02-28 10:25:11 -08:00
Greg Neagle 0954498f5d Tweak what process we're looking for to identify currently logged in users 2024-02-27 11:11:30 -08:00
Greg Neagle 15de9eea80 Modernize launchctl commands in app_usage pkg pre- and postinstall scripts. (Dropping support for pre-macOS 10.10) 2024-02-27 10:11:06 -08:00
Greg Neagle 9e541a8e1a Update Python build script and packaging bits to support Python 3.12; update Python requirements 2024-02-23 11:18:58 -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 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 268171ae19 Adjust Python pkg scripts to work properly when package is installed to a volume other than the boot volume. 2023-07-05 09:02:15 -07:00
Greg Neagle 42feda2204 Bug fix for Python preinstall script 2023-03-21 09:41:34 -07:00
Greg Neagle f275bc9267 Add pre and postinstall scripts to Python component package to prevent active Python from being removed during an upgrade 2023-03-21 09:07:20 -07:00
Greg Neagle 6b0bd81b6f Bump Python version to 3.11.2; PyObjC version to 9.0.1, etc 2023-03-15 16:56:19 -07:00
Greg Neagle 60cfd69bb7 Build a Python 3.9.13 framework instead of 3.10.x to avoid issue #1136 2022-05-20 09:00:56 -07:00
Greg Neagle bf78ccd971 Update pkg build script to build a single package that should work for both MDM-style and most non-MDM scenarios 2022-05-02 21:24:05 -07:00
Greg Neagle 1c19f97928 Update Python cleanup script to remove version 3.9 from the framework if it's still there 2022-04-28 19:12:33 -07:00
Greg Neagle f323f12174 make_munki_mpkg.sh: Add support for triggering a managedsoftwareupdate --auto run immediately after install 2022-04-28 19:11:25 -07:00
Greg Neagle 5096c0a209 Merge branch 'main' into universal2 2021-01-19 09:47:03 -08:00
Greg Neagle 053e3eac9e Update pkg pre and postinstall scripts to use os version comparision compatible with Big Sur 2021-01-19 09:46:18 -08:00
dhmoore 4c5485d6af = instead of == for POSIX sh compliance (#1063) 2020-12-07 10:53:38 -08:00
dhmoore e8732e0924 = instead of == for POSIX sh compliance (#1063) 2020-12-07 10:48:21 -08:00
Greg Neagle 0ae0d5c609 Changes for Universal2 builds including Python 3.9.1rc1 and PyObjC 7.0 2020-11-29 16:18:29 -08:00
Greg Neagle d9520b8af6 Do not attempt to install Rosetta2 if we're not installing to the current startup disk 2020-11-24 09:11:39 -08:00
eholtam 5fd7f00885 Add rosetta2 option to build script (#1056) 
* Added option for Rosetta2 install for ARM hardware.

* Add hostArchitectures option to Distribution for arm64 support

* Removed file based arm64 arch addition attempt to Distribution

* Adjusted hostArchitecture to be a variable, adding arm64 only if Rosetta is included

Co-authored-by: eholtam <(none)>
 2020-11-18 14:07:55 -08: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 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 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 03c822ece2 Move pkg scripts into code/tools/pkgresources 2020-08-22 15:33:38 -07:00