From 4a8a47c3f12a1e138ffc2a90396b86bbfb5a3917 Mon Sep 17 00:00:00 2001 From: a-vogel Date: Thu, 4 Dec 2025 15:35:19 +0100 Subject: [PATCH 1/2] Switch from munki-python to MacAdmins Python --- AddPrinter-Template.plist | 6 +++--- print_generator.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/AddPrinter-Template.plist b/AddPrinter-Template.plist index 58fa93e..c0c886a 100644 --- a/AddPrinter-Template.plist +++ b/AddPrinter-Template.plist @@ -13,7 +13,7 @@ display_name DISPLAY_NAME installcheck_script - #!/usr/local/munki/munki-python + #!/usr/local/bin/managed_python3 import subprocess import sys import shlex @@ -80,7 +80,7 @@ sys.exit(1) name AddPrinter_DISPLAYNAME preinstall_script - #!/usr/local/munki/munki-python + #!/usr/local/bin/managed_python3 import subprocess import sys @@ -106,7 +106,7 @@ else: sys.exit(543) postinstall_script - #!/usr/local/munki/munki-python + #!/usr/local/bin/managed_python3 import subprocess import sys diff --git a/print_generator.py b/print_generator.py index a8152a0..9e4787e 100755 --- a/print_generator.py +++ b/print_generator.py @@ -1,4 +1,4 @@ -#!/usr/local/munki/munki-python +#!/usr/local/bin/managed_python3 from __future__ import absolute_import, print_function import argparse From c0c7b2ed172aa69f6021c8b3438fdd1e49fca002 Mon Sep 17 00:00:00 2001 From: a-vogel Date: Thu, 4 Dec 2025 15:52:13 +0100 Subject: [PATCH 2/2] Update README.md --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6c5c25c..b8d34d7 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,8 @@ This is a fork of [nmcspadden/PrinterGenerator](https://github.com/nmcspadden/Pr This updated version implements some cool new things: -* Support for macOS 10.14, 10.15, 11, 12, 13 and 14 -* Usage of the Munki-included Python3 +* Support for macOS 10.14, 10.15, 11, 12, 13, 14, 15 and 26 +* Usage of [MacAdmins Python](https://github.com/macadmins/python) (munki-python was removed in Munki 7) * Enhances usage of Microsoft Excel to edit the CSV file: for regions which use the comma as the decimal separator, Microsoft Excel expects a semicolon as separator in CSV files. The script will distinguish between both variants. * The order of the csv columns do not have to be preserved, but **keep the names of the 1st row**. * Sanity checks for the csv fields @@ -19,7 +19,6 @@ This updated version implements some cool new things: * Option to define a path to Munki repo and an optional subdirectory * Option to define a separate name for the Munki pkginfo item * Option to define a Munki category -* **This script should preserve backward compatibility!** ## Caveats