Commit Graph

235 Commits

Author SHA1 Message Date
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 - 374fbaf922 (r1515000516)
- Remove erroneous login window comments - 374fbaf922 (r1515006835) and 374fbaf922 (r1515006962)
- Simplified IF condition - 374fbaf922 (r1515005565) this was in place incase LimitLoadToSessionType contained multiple values (as it can).

* Update installhelper

- Reverted changes made for - 374fbaf922 (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
df25ade13a Change where munki-python symlink points for compatibility with Python 3.12 framework (and possiblt Python 3.11) 2024-02-23 09:35:26 -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
35d24d11e9 Address minor output issue when building a Munki pkg 2023-12-05 09:37:29 -08:00
Greg Neagle
1025673bae Ensure dist pkg declares a minimum os version of 10.13 2023-11-22 12:42:31 -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
5f64d7941a Bump Python to 3.10.11. Bump PyObjC to 9.1.1. 2023-06-07 16:46:45 -07:00
Erik Gomez
6c27df4831 properly codesign all applications and python (#1174) 2023-04-05 14:26:45 -07:00
Greg Neagle
42feda2204 Bug fix for Python preinstall script 2023-03-21 09:41:34 -07:00
Greg Neagle
5671590888 Merge branch 'munkishim' into Munki6dev 2023-03-21 09:08:14 -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
e5eda229ae Move Python version to 3.10.10 to avoid a nasty upstream bug in 3.11.x 2023-03-21 09:06:26 -07:00
Kory Prince
9006c818e8 add munkishim signing to make_munki_mpkg.sh (#1170) 2023-03-20 15:08:04 -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
62a75d6384 Update build script to shim only managedsoftwareupdate 2023-03-13 13:13:41 -07:00
Greg Neagle
36acee5cde Update make_munki_mpkg.sh to build munkishim and build core tools with the shim in place of managedsoftwareupdate and supervisor 2023-02-10 15:22:11 -08:00
Greg Neagle
d39cb523b2 Revert to Python 3.9.13 since there is no macOS package download for 3.9.14. 2022-10-05 16:46:05 -07:00
Greg Neagle
3db57a287c Bump Python version to 3.9.14. 2022-10-05 08:14:42 -07:00
Greg Neagle
a82732dcd7 Remove standalone adminopen tool; embed it in the Python so it's not easily available for mischief 2022-08-29 20:56:11 -07:00
Greg Neagle
b6be68b1e9 Add adminopen to core pkg 2022-08-25 15:44:18 -07:00
eholtam
701f6bcbb3 Update make_munki_mpkg_from_git flags to match the changes in make_muinki_mpkg.sh. (#1144)
Authored-by: eholtam <(none)>
2022-06-16 11:56:24 -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
84f3c6f3fe Reduce included PyObjC modules to reduce build time, installation size, and maintenance tasks 2022-05-10 13:34:27 -07:00
Greg Neagle
8a2f4d191b update the list of PyObjC modules to be a superset of what is part of the 5.6.4 release 2022-05-04 16:08:04 -07:00
Greg Neagle
01568e15d2 Bump PyObjC version to 8.5; don't attempt to build pyobjc-framework-ScreenCaptureKit (not needed by Munki; errors on attempt) 2022-05-04 14:33:29 -07:00
Greg Neagle
878484e81b Restore restart postinstall-action for 'standalone' launchd pkg 2022-05-03 09:15:46 -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
876060448b Update Munki uninstall script to reflect current install 2022-05-02 21:16:16 -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
2c614e972e Bump Python version to 3.10.4 and PyObjC to 8.2 2022-04-06 09:41:45 -07:00
Greg Neagle
f6a49175c7 Change PyObjC version to 7.2 to deal with issue #1115 2021-10-27 16:55:24 -07:00
Greg Neagle
acfbe8ea3f Change package directory structure creation methods to not trigger CrowdStrike :-( 2021-10-04 11:00:56 -07:00
Greg Neagle
87365bef62 Bump Python version to 3.9.7; bump PyObjC to 7.3 2021-09-08 14:23:40 -07:00
macmule
e8ccc5f53e Update build_python_framework.sh (#1096)
Corrects the Python.framework path, and end of the script.

Before:

```
Verifying Universal2 builds...
     182 libraries (*.so and *.dylib) found in the framework; only       90 are universal!
The following libraries are not universal:
find: Python.framework: No such file or directory
```

After:

```
Verifying Universal2 builds...
     182 libraries (*.so and *.dylib) found in the framework; only       90 are universal!
The following libraries are not universal:
/Users/ben/Git/munki/Python.framework/Versions/3.9/lib/python3.9/site-packages/StoreKit/_StoreKit.abi3.so:                                                 Mach-O 64-bit bundle x86_64
</snip>
```
2021-06-17 10:25:43 -07:00
Greg Neagle
75010e835c Bump Python version to 3.9.5 2021-05-24 15:36:32 -07:00
rrenstrom
56a1dd0cee Add support for client cert package (#1091)
* Build script flag to include client cert

Adds -T flag to make_munki_pkg build scripts to include a component package containing a client certificate for server mTLS

* define no script for certain component packages

In make_munki_mpkg.sh add SCRIPTS="" to  clientcert"), "bootstrap") and "config") cases for pkgbuild, so no script is included in these component packages.
2021-05-14 14:25:02 -07:00
Greg Neagle
b4190710c2 Add asn1crypto to py3_requirements.txt to support new client cert functionality 2021-05-11 15:01:50 -07:00
Greg Neagle
43eb5405df Bump PyObjC version to 7.1; sadly need to compile from source since the wheels are x86_64 only 2021-04-12 08:38:06 -07:00
Greg Neagle
7d53d176b0 Update Python version to 3.9.4 2021-04-09 15:21:05 -07:00
Greg Neagle
7f554f5bfb Bump Python version to 3.9.2 2021-03-02 08:28:22 -08:00
Greg Neagle
165e3e79a2 Merge branch 'main' into universal2 2021-02-12 13:37:18 -08:00
Greg Neagle
0620b2330c Fix typos in help text for make_munki_mpkg.sh and make_munki_mpkg_from_git.sh 2021-02-12 13:36:30 -08:00
Greg Neagle
d48a622e34 No longer include a no_python component package in the generated distribution package 2021-02-04 08:10:03 -08:00