Merge pull request grahampugh#96 from autopkg/jcds_mode

expand user for search_dir_path

Author: grahampugh

JamfUploaderProcessors/JamfUploaderLib/JamfUploaderBase.py

@@ -459,14 +459,12 @@ def get_api_obj_id_from_name(
         if r.status_code == 200:
             object_list = json.loads(r.output)
             self.output(
-                object_list,
-                verbose_level=4,
+                object_list, verbose_level=4,
             )
             obj_id = 0
             for obj in object_list[self.object_list_types(object_type)]:
                 self.output(
-                    obj,
-                    verbose_level=4,
+                    obj, verbose_level=4,
                 )
                 # we need to check for a case-insensitive match
                 if obj["name"].lower() == object_name.lower():
@@ -502,9 +500,7 @@ def substitute_assignable_keys(self, data, xml_escape=False):
                         replacement_key = self.env.get(found_key)
                     data = data.replace(f"%{found_key}%", replacement_key)
                 else:
-                    self.output(
-                        f"WARNING: '{found_key}' has no replacement object!",
-                    )
+                    self.output(f"WARNING: '{found_key}' has no replacement object!",)
                     raise ProcessorError("Unsubstitutable key in template found")
         return data
 
@@ -531,7 +527,7 @@ def get_path_to_file(self, filename):
                 ):
                     self.output(f"Matching dir: {override_dir_path}", verbose_level=3)
                     matched_override_dir = override_dir_path
-                for path in Path(d).rglob(filename):
+                for path in Path(os.path.expanduser(d)).rglob(filename):
                     matched_filepath = str(path)
                     break
             if matched_filepath:
@@ -555,7 +551,7 @@ def get_path_to_file(self, filename):
                 ):
                     # matching search dir, look for file in here
                     self.output(f"Matching dir: {search_dir_path}", verbose_level=3)
-                    for path in Path(d).rglob(filename):
+                    for path in Path(os.path.expanduser(d)).rglob(filename):
                         matched_filepath = str(path)
                         break
                 if matched_filepath:
@@ -579,7 +575,7 @@ def get_path_to_file(self, filename):
                     ):
                         # matching parent dir, look for file in here
                         self.output(f"Matching dir: {search_dir_path}", verbose_level=3)
-                        for path in Path(d).rglob(filename):
+                        for path in Path(os.path.expanduser(d)).rglob(filename):
                             matched_filepath = str(path)
                             break
                     if matched_filepath:
@@ -645,9 +641,7 @@ def substitute_limited_assignable_keys(
                         replacement_key = cli_custom_keys[found_key]
                     data = data.replace(f"%{found_key}%", replacement_key)
                 else:
-                    self.output(
-                        f"WARNING: '{found_key}' has no replacement object!",
-                    )
+                    self.output(f"WARNING: '{found_key}' has no replacement object!",)
         return data
 
     def pretty_print_xml(self, xml):