adding flexibility to check pkgsinfo

kbrewersq · kbrewersq · commit c22a777fb80e · 2023-12-07T10:52:45.000-06:00
diff --git a/pre_commit_hooks/check_munki_pkgsinfo.py b/pre_commit_hooks/check_munki_pkgsinfo.py
@@ -35,6 +35,8 @@ def build_argument_parser():
         help="Require a blocking_applications array for pkg installers.",
     )
     parser.add_argument("filenames", nargs="*", help="Filenames to check.")
+    parser.add_argument("--munki_repo", default='.',
+                        help="path to local munki repo defaults to '.'")
     return parser
 
 
@@ -174,7 +176,8 @@ def main(argv=None):
         if not any(
             (
                 pkginfo.get("icon_name"),
-                os.path.isfile("icons/{}.png".format(pkginfo["name"])),
+                os.path.isfile(os.path.join(args.munki_repo,
+                               "icons/{}.png".format(pkginfo["name"]))),
                 pkginfo.get("installer_type") == "apple_update_metadata",
             )
         ):

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,8 @@ def build_argument_parser():`
`35`	`35`	`help="Require a blocking_applications array for pkg installers.",`
`36`	`36`	`)`
`37`	`37`	`parser.add_argument("filenames", nargs="*", help="Filenames to check.")`
	`38`	`+ parser.add_argument("--munki_repo", default='.',`
	`39`	`+ help="path to local munki repo defaults to '.'")`
`38`	`40`	`return parser`
`39`	`41`
`40`	`42`
`@@ -174,7 +176,8 @@ def main(argv=None):`
`174`	`176`	`if not any(`
`175`	`177`	`(`
`176`	`178`	`pkginfo.get("icon_name"),`
`177`		`- os.path.isfile("icons/{}.png".format(pkginfo["name"])),`
	`179`	`+ os.path.isfile(os.path.join(args.munki_repo,`
	`180`	`+ "icons/{}.png".format(pkginfo["name"]))),`
`178`	`181`	`pkginfo.get("installer_type") == "apple_update_metadata",`
`179`	`182`	`)`
`180`	`183`	`):`