mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-01-07 23:20:00 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,793 Commits 9 Branches 112 Tags
518dbade54c2ca82fa353f63daf68a09a14a082d
Commit Graph

180 Commits

Author SHA1 Message Date
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
dhmoore
e8732e0924 = instead of == for POSIX sh compliance (#1063) 2020-12-07 10:48:21 -08:00
Greg Neagle
3d92ba59ba For Universal2 builds, declare arm64 support in the installer pkg 2020-12-02 07:57:57 -08:00
Greg Neagle
e724297686 Ad-hoc code signing of Python framework so it will work on Apple Silicon 2020-11-30 13:59:30 -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
Greg Neagle
fcf6e8c7a8 Explictly set hostArchitectures in the Distribution only if -R (Rosetta) option is given; leave undefined (and default) otherwise 2020-11-18 14:46:26 -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
Greg Neagle
5da152bd76 Change volume-check in mpkg distribution so minimum OS version is 10.11. 2020-11-17 16:57:39 -08:00
Greg Neagle
32267f4285 Fix lack of newline at end of code/tools/py3_requirements.txt 2020-11-07 11:28:27 -08:00
Greg Neagle
645a7cdb91 Error output tweak 2020-10-22 13:24:10 -07:00
thefuzzyjew
0576697cf4 Differentiate between version.plist not existing and being unreadable (#1035) 
* Differentiate between version.plist not existing and being unreadable

* change $versionfile to ${versionfile}.plist for clarity
 2020-10-22 13:21:51 -07:00
Greg Neagle
2cbc98df7e Merge branch 'Munki5dev' into new-msc-design 2020-09-16 14:46:29 -07: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
c27fd3c07f Logic change to get the Python revision number to increment 'better' 2020-09-15 17:08:33 -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
69411e7e24 Merge branch 'Munki5dev' into new-msc-design 2020-09-15 09:08:09 -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
e86e2c0698 Merge branch 'Munki5dev' into new-msc-design 2020-09-14 13:20:09 -07:00
eholtam
0e14dccdb1 Removed detection of absolute path (#1016) 
* Removed detection of absolute path. It paths wrong if the supplied file is not in the cwd.

* Convert supplied config file to an absolute path and use that variable for all references to the file.

Co-authored-by: eholtam <(none)>
 2020-09-03 15:48:02 -07:00
Greg Neagle
54d3b56b93 Merge Steve Kueng's MSC work into new-msc-design 2020-09-02 16:36:45 -07:00
Greg Neagle
85dde11196 Better processing of addditional options to make_munki_mpkg.sh 2020-08-25 08:40:32 -07:00
Greg Neagle
1399cfa839 Merge branch 'newbuildscript' of https://github.com/munki/munki into newbuildscript 2020-08-24 21:06:30 -07:00
Marnin
ee755fe295 Fixed minor typos (#1015) 
* Fixed minor typo

* Fixed minor typo
 2020-08-24 19:20:20 -07:00
Greg Neagle
45ec30f7b9 Fix for default output dir 2020-08-24 13:43:22 -07:00
Greg Neagle
aa91e5a7a7 Tweak help text 2020-08-24 08:54:16 -07:00
Greg Neagle
d5474f9271 Tweak help text 2020-08-23 18:49:06 -07:00
Greg Neagle
631095fc78 Tweak help text 2020-08-23 18:34:01 -07:00
Greg Neagle
b39b5b8c20 Update make_munki_mpkg_from_git.sh to reflect changes in make_munki_mpkg.sh 2020-08-23 18:32:41 -07:00
Greg Neagle
e7b688dc66 Add support for building a config pkg from a preferences plist 2020-08-23 18:31:51 -07:00
Greg Neagle
a7d097291e Remove unsupported make_munki_mpkg_DEP.sh script. 2020-08-23 14:13:31 -07:00
Greg Neagle
ff9b98d783 Add support for bootstrap pkg 2020-08-23 14:12:21 -07:00
Greg Neagle
03c822ece2 Move pkg scripts into code/tools/pkgresources 2020-08-22 15:33:38 -07:00
Greg Neagle
1a54a675e0 Missed a pkg naming format change 2020-08-22 15:11:27 -07:00
Greg Neagle
37fc16bfdf Simplify some of the pkg creation tasks in make_munki_mpkg.sh; add git revision count to python pkg version 2020-08-22 13:41:41 -07:00
Greg Neagle
b573ee66cb Incorporate 'DEP' functionality into make_munki_mpkg.sh 2020-08-22 11:32:34 -07:00
Greg Neagle
19b5555d7e Add postinstall script to Python pkg that removes older versions from the framework and ensures the python symlink is removed. Addresses #1010" 2020-08-10 10:41:17 -07:00
Greg Neagle
347908b3aa Bump Python version to 3.8.5 2020-08-04 20:42:14 -07:00
Steve Küng
cf2a39f9b6 Merge branch 'main' of https://github.com/munki/munki into new_design 
# Conflicts:
#	code/apps/Managed Software Center/Managed Software Center/Controllers/MainWindowController.swift
 2020-07-22 12:37:53 +02:00
Greg Neagle
2a12d3d452 Update munki-python symlink to use Python.framework/Versions/Current/bin/python3 path 2020-07-08 14:49:27 -07:00
Greg Neagle
37e81f8aaf Update Python framework to Python 3.8.3 and PyObjC to 6.2.2 2020-07-08 13:21:08 -07:00
David Aguilar
3bb91cabca munki: rename "/usr/local/munki/python" symlink to "munki-python" (#997) 
Avoid masking the system /usr/bin/python by calling our symlink
"munki-python" instead of "python".

Closes #996
 2020-07-07 13:58:34 -07:00
Greg Neagle
eadced8bc1 make_munki_mpkg_from_git.sh: change default branch to 'main' 2020-06-15 14:52:43 -07:00
Steve Küng
1b3cb211b6 Merge branch 'master' of https://github.com/munki/munki into new_design 
# Conflicts:
#	code/apps/Managed Software Center/Managed Software Center.xcodeproj/project.pbxproj
#	code/apps/Managed Software Center/Managed Software Center/Controllers/MainWindowController.swift
#	code/apps/Managed Software Center/Managed Software Center/Info.plist
#	code/apps/Managed Software Center/Managed Software Center/de.lproj/Localizable.strings
 2020-06-09 18:43:41 +02:00
Greg Neagle
f500b68418 Add repoclean to the admin tools pkg 2020-03-25 19:16:36 -07:00
Steve Küng
9f8e4ecf9e fix codesign 2020-03-11 15:10:44 +01:00
pranavshenoy
7024c7721b adding quotes to avoid build script failure (#965) 2020-01-07 15:31:19 -08:00
Greg Neagle
9ddc5a063a Added python component pkgs to make_munki_mpkg_DEP.sh 2019-12-06 15:24:12 -08:00