From 3f05a4304343edd90eb9c1760b27668487b29fa0 Mon Sep 17 00:00:00 2001 From: Greg Neagle Date: Fri, 12 Sep 2025 14:53:26 -0700 Subject: [PATCH] Remove dependency on /usr/local/munki/munkilib for munkiinfo.py external script --- server/plugins/munkiinfo/scripts/munkiinfo.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/server/plugins/munkiinfo/scripts/munkiinfo.py b/server/plugins/munkiinfo/scripts/munkiinfo.py index 909f9aa1..03a4c7eb 100755 --- a/server/plugins/munkiinfo/scripts/munkiinfo.py +++ b/server/plugins/munkiinfo/scripts/munkiinfo.py @@ -4,8 +4,16 @@ import sys import sal -sys.path.append('/usr/local/munki') -from munkilib import munkicommon + +from Foundation import CFPreferencesCopyAppValue, NSDate + + +def munkiPref(pref_name): + pref_value = CFPreferencesCopyAppValue(pref_name, "ManagedInstalls") + if isinstance(pref_value, NSDate): + # convert NSDate/CFDates to strings + pref_value = str(pref_value) + return pref_value PREFS_TO_GET = ( @@ -60,7 +68,7 @@ def main(): # Manual check: skipping MunkiInfo Plugin exit(0) - data = {pref: str(munkicommon.pref(pref)) for pref in PREFS_TO_GET} + data = {pref: str(munkiPref(pref)) for pref in PREFS_TO_GET} sal.add_plugin_results('MunkiInfo', data)