diff --git a/code/Managed Software Update/Info.plist b/code/Managed Software Update/Info.plist index caa7f792..ff510baa 100644 --- a/code/Managed Software Update/Info.plist +++ b/code/Managed Software Update/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.5.0 + 3.5.1 CFBundleSignature ???? CFBundleVersion diff --git a/code/Managed Software Update/munki.py b/code/Managed Software Update/munki.py index 3ddb573b..59cac545 100644 --- a/code/Managed Software Update/munki.py +++ b/code/Managed Software Update/munki.py @@ -425,7 +425,7 @@ def getRunningBlockingApps(appnames): if appname.endswith('.app'): # search by filename matching_items = [item for item in proc_list - if '/'+ appname + '/' in item] + if '/'+ appname + '/Contents/MacOS/' in item] else: # check executable name matching_items = [item for item in proc_list @@ -434,7 +434,7 @@ def getRunningBlockingApps(appnames): if not matching_items: # try adding '.app' to the name and check again matching_items = [item for item in proc_list - if '/' + appname + '.app/' in item] + if '/' + appname + '.app/Contents/MacOS/' in item] matching_items = set(matching_items) for path in matching_items: diff --git a/code/client/munkilib/munkicommon.py b/code/client/munkilib/munkicommon.py index a32faced..e4706d37 100644 --- a/code/client/munkilib/munkicommon.py +++ b/code/client/munkilib/munkicommon.py @@ -2079,7 +2079,7 @@ def isAppRunning(appname): if appname.endswith('.app'): # search by filename matching_items = [item for item in proc_list - if '/'+ appname + '/' in item] + if '/'+ appname + '/Contents/MacOS/' in item] else: # check executable name matching_items = [item for item in proc_list @@ -2087,7 +2087,7 @@ def isAppRunning(appname): if not matching_items: # try adding '.app' to the name and check again matching_items = [item for item in proc_list - if '/'+ appname + '.app/' in item] + if '/'+ appname + '.app/Contents/MacOS/' in item] if matching_items: # it's running!