Greg Neagle
613101480f
Merge branch 'Munki5dev' into universal2
2021-02-05 09:12:49 -08:00
Greg Neagle
5f680b9862
Python 3 fixes for IOPlatform and sysctl functions ported from Python 2 :-(
2021-02-05 09:12:10 -08:00
Greg Neagle
a9756cef8e
Merge branch 'Munki5dev' into universal2
2021-02-05 08:09:40 -08:00
Greg Neagle
0f6d817850
In info.py, get the hardware model without calling system_profiler
2021-02-05 08:09:20 -08:00
Greg Neagle
0de132711f
Merge branch 'Munki5dev' into universal2
2021-02-04 16:58:28 -08:00
Greg Neagle
c8b9554d77
Get machine serial number without calling system_profiler. Works around manifest resolution issue when system_profiler times out or otherwise misbehaves.
2021-02-04 16:57:59 -08:00
Greg Neagle
2462b64e64
No longer include a no_python component package in the generated distribution package
2021-02-04 08:10:34 -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
Greg Neagle
9f733b6341
app_usage_monitor: don't let app_version be undefined if app_path is falsish
2021-02-03 15:07:49 -08:00
Greg Neagle
d26c8b5861
app_usage_monitor: don't let app_version be undefined if app_path is falsish
2021-02-03 15:06:55 -08:00
Greg Neagle
5096c0a209
Merge branch 'main' into universal2
2021-01-19 09:47:03 -08:00
Greg Neagle
f4fb3a30e3
Merge branch 'main' into Munki5dev
2021-01-19 09:46:42 -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
Greg Neagle
778d01f5ab
build_python_framework.sh: print any libraries found inside the generated Python framework that are not universal
2021-01-06 08:51:21 -08:00
Greg Neagle
1ba3fe3551
Merge branch 'main' into universal2
2020-12-15 08:16:02 -08:00
Greg Neagle
8b9de80131
Merge branch 'main' into Munki5dev
2020-12-15 08:15:26 -08:00
Greg Neagle
ae28a71550
Improved OS version comparisons taking into account new (Big Sur+) versioning 'style'
2020-12-15 08:15:03 -08:00
Greg Neagle
c9f74aed6d
Merge branch 'main' into universal2
2020-12-14 14:34:18 -08:00
Greg Neagle
40779023ad
Merge branch 'main' into Munki5dev
2020-12-14 14:33:51 -08:00
Greg Neagle
49625ed975
Fix for Software Update catalog issue with 11.1
2020-12-14 14:33:23 -08:00
Greg Neagle
a2fde07886
update build script and requirements for universal Python3
2020-12-11 16:31:31 -08:00
Greg Neagle
a433418c9d
Merge branch 'main' into universal2
2020-12-09 10:36:20 -08:00
Greg Neagle
cae60328ff
Merge branch 'main' into Munki5dev
2020-12-09 10:35:43 -08:00
Greg Neagle
16fba06468
Update default banner images to better work with new minimum size
2020-12-09 10:35:20 -08:00
Greg Neagle
518dbade54
Pin xattr, pyobjc and six versions in pip requirements file
2020-12-08 10:02:37 -08:00
Greg Neagle
72dc2a652f
Update build_python_framework.sh to build from 3.9.1 release
2020-12-08 10:01:51 -08:00
Greg Neagle
c9e41fa3f0
Merge branch 'main' into universal2
2020-12-07 22:23:57 -08:00
Greg Neagle
1e8cda8d40
Merge branch 'main' into Munki5dev
2020-12-07 22:22:02 -08:00
Greg Neagle
b1d3cd0e1d
Fix default logic when clearing web cache
2020-12-07 22:21:25 -08:00
Greg Neagle
fa89b511ea
Merge branch 'main' into Munki5dev
2020-12-07 15:50:15 -08:00
Greg Neagle
86a8f19bef
Resolve MunkiStatus build issues under Xcode 12.2
2020-12-07 15:49:46 -08:00
Greg Neagle
44f70823ef
Merge branch 'main' into universal2
2020-12-07 15:35:49 -08:00
Greg Neagle
1d0e3d33e7
Merge branch 'main' into Munki5dev
2020-12-07 15:35:20 -08:00
Greg Neagle
e0f1db2620
Update os version comparison in MunkiStatus to work properly when complied against the Big Sur SDK (10.16.x vs 11.x)
2020-12-07 15:35:04 -08:00
Greg Neagle
dd9bbfe0cc
Merge branch 'main' into universal2
2020-12-07 15:31:33 -08:00
Greg Neagle
a13cb69f79
Merge branch 'main' into Munki5dev
2020-12-07 15:31:06 -08:00
Greg Neagle
40203eea67
Update some other os version comparisons in Managed Software Center so they function correctly when compiled against the Big Sur SDK
2020-12-07 15:30:35 -08:00
Greg Neagle
97d57a09c9
Merge branch 'Munki5dev' into universal2
2020-12-07 10:56:46 -08:00
Noah
cdc3b40561
Adding managed_updates support for local manifest ( #1027 )
...
* 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
* Revert "Support repo-based makecatalogs (#1012 )" (#1013 )
This reverts commit 98a31e802etaylorboyko@gmail.com >
Co-authored-by: Greg Neagle <Gregneagle@mac.com >
Co-authored-by: Noah.Anderson <noah.anderson@target.com >
2020-12-07 10:56:00 -08:00
Greg Neagle
54abb7aa75
Merge branch 'main' into universal2
2020-12-07 10:54:48 -08:00
dhmoore
4c5485d6af
= instead of == for POSIX sh compliance ( #1063 )
2020-12-07 10:53:38 -08:00
Ben Goodstein
7eeed78995
Fixing non-US English localisations ( #1062 )
2020-12-07 10:49:29 -08:00
dhmoore
e8732e0924
= instead of == for POSIX sh compliance ( #1063 )
2020-12-07 10:48:21 -08:00
Greg Neagle
8e543820bd
Merge branch 'main' into universal2
2020-12-07 10:32:56 -08:00
Greg Neagle
d270024803
Now actually get the required OS version correct for Dark Mode support
2020-12-07 10:32:16 -08:00
Greg Neagle
ea4c164a9d
Merge branch 'main' into universal2
2020-12-07 10:26:03 -08:00
Greg Neagle
0e55893916
Fix os version detection when querying if we're in Dark Mode. Addresses #1060 .
2020-12-07 10:24:31 -08:00
Greg Neagle
c2d9578a16
Bump version in version.plist for future release.
2020-12-02 16:44:07 -08:00
Greg Neagle
53feeab1dc
Merge branch 'main' into universal2
2020-12-02 16:40:49 -08:00
Greg Neagle
7f736a4901
Nasty hack to return native processor arch even when running under Rosetta
2020-12-02 16:39:52 -08:00
