chore: fix dmg background by updating vendor dmgbuild (#9512)

Author: mmaietta

.changeset/empty-goats-cover.md

@@ -0,0 +1,5 @@
+---
+"dmg-builder": patch
+---
+
+chore: fix dmg background by updating vendor dmgbuild

packages/dmg-builder/vendor/dmgbuild/__init__.py

@@ -1,5 +1,5 @@
 from .core import build_dmg
 
-__version__ = "1.6.5"
+__version__ = "1.6.6"
 
 __all__ = ["__version__", "build_dmg"]

packages/dmg-builder/vendor/dmgbuild/__main__.py

@@ -9,7 +9,10 @@ def main():
     parser.add_argument(
         "volume_name",
         metavar="volume-name",
-        help="The name to give to the volume (this will appear in the title bar when the user mounts the disk image).",
+        help=(
+            "The name to give to the volume (this will appear in the title "
+            "bar when the user mounts the disk image)."
+        ),
     )
     parser.add_argument(
         "filename",

packages/dmg-builder/vendor/dmgbuild/badge.py

@@ -43,7 +43,7 @@ def badge_disk_icon(badge_file, output_file):
     # Load the badge
     url = CFURLCreateWithFileSystemPath(None, badge_file, kCFURLPOSIXPathStyle, False)
     badge = CGImageSourceCreateWithURL(url, None)
-    assert badge is not None, "Unable to process image file: %s" % badge_file
+    assert badge is not None, f"Unable to process image file: {badge_file}"
     badgeCount = CGImageSourceGetCount(badge)
 
     # Set up a destination for our target

packages/dmg-builder/vendor/dmgbuild/colors.py

@@ -18,10 +18,10 @@ def to_rgb(self):
 
 
 class HSL(Color):
-    def __init__(self, h, s, l):  # noqa; E741
+    def __init__(self, h, s, l):  # noqa: E741
         self.h = h
         self.s = s
-        self.l = l  # noqa; E741
+        self.l = l  # noqa: E741
 
     @staticmethod
     def _hue_to_rgb(t1, t2, hue):
@@ -41,7 +41,7 @@ def _hue_to_rgb(t1, t2, hue):
 
     def to_rgb(self):
         hue = self.h / 60.0
-        if self.l <= 0.5:  # noqa; E741
+        if self.l <= 0.5:  # noqa: E741
             t2 = self.l * (self.s + 1)
         else:
             t2 = self.l + self.s - (self.l * self.s)
@@ -281,7 +281,7 @@ def expect(self, s, context=""):
 
     def expectEnd(self):
         if self._pos != len(self._string):
-            raise ValueError('junk at end of color "%s"' % self._string)
+            raise ValueError(f'junk at end of color "{self._string}"')
 
     def getToken(self):
         m = _token_re.match(self._string, self._pos)
@@ -318,7 +318,7 @@ def parseColor(self):
             try:
                 r, g, b = _x11_colors[token]
             except KeyError:
-                raise ValueError('unknown color name "%s"' % token)
+                raise ValueError(f'unknown color name "{token}"')
 
             self.expectEnd()
 
@@ -344,7 +344,7 @@ def parseColor(self):
 
             return RGB(r / 255.0, g / 255.0, b / 255.0)
 
-        raise ValueError('bad color syntax "%s"' % self._string)
+        raise ValueError(f'bad color syntax "{self._string}"')
 
     def parseRGB(self):
         self.expect("(", 'after "rgb"')
@@ -388,7 +388,7 @@ def parseHSL(self):
         self.expect(",", 'in "hsl"')
         self.skipws()
 
-        l = self.parseValue()  # noqa; E741
+        l = self.parseValue()  # noqa: E741
 
         self.skipws()
         self.expect(")", 'at end of "hsl"')
@@ -487,12 +487,12 @@ def parseAngle(self):
         elif tok == "grad" or tok == "gon":
             n = n * 0.9
         elif tok != "deg":
-            raise ValueError('bad angle unit "%s"' % tok)
+            raise ValueError(f'bad angle unit "{tok}"')
         return n
 
 
 _color_re = re.compile(
-    r"\s*(#|rgb|hsl|hwb|cmyk|gray|grey|%s)" % "|".join(_x11_colors.keys())
+    r"\s*(#|rgb|hsl|hwb|cmyk|gray|grey|{})".format("|".join(_x11_colors.keys()))
 )
 
 

packages/dmg-builder/vendor/dmgbuild/core.py

@@ -15,7 +15,7 @@
     from importlib import resources
 
 from ds_store import DSStore
-from mac_alias import Alias, Bookmark
+from mac_alias import Alias
 
 from . import colors, licensing
 
@@ -159,16 +159,20 @@ def load_json(filename, settings):
     settings["icon_locations"] = icon_locations
 
 
-def build_dmg(  # noqa; C901
+def build_dmg(  # noqa: C901
     filename,
     volume_name,
     settings_file=None,
-    settings={},
-    defines={},
+    settings=None,
+    defines=None,
     lookForHiDPI=True,
     detach_retries=12,
     callback=quiet_callback,
 ):
+    if defines is None:
+        defines = {}
+    if settings is None:
+        settings = {}
     options = {
         # Default settings
         "filename": filename,
@@ -269,8 +273,8 @@ def build_dmg(  # noqa; C901
     # Set up the finder data
     bounds = options["window_rect"]
 
-    bounds_string = "{{{{{}, {}}}, {{{}, {}}}}}".format(
-        bounds[0][0], bounds[0][1], bounds[1][0], bounds[1][1]
+    bounds_string = (
+        f"{{{{{bounds[0][0]}, {bounds[0][1]}}}, {{{bounds[1][0]}, {bounds[1][1]}}}}}"
     )
     bwsp = {
         "ShowStatusBar": options["show_status_bar"],
@@ -373,8 +377,11 @@ def build_dmg(  # noqa; C901
     for n, column in enumerate(options["list_columns"]):
         cndx[column] = n
         width = options["list_column_widths"].get(column, default_widths[column])
-        asc = "ascending" == options["list_column_sort_directions"].get(
-            column, default_sort_directions[column]
+        asc = (
+            options["list_column_sort_directions"].get(
+                column, default_sort_directions[column]
+            )
+            == "ascending"
         )
 
         lsvp["columns"][columns[column]] = {
@@ -387,10 +394,10 @@ def build_dmg(  # noqa; C901
 
     n = len(options["list_columns"])
     for k in columns:
-        if cndx.get(k, None) is None:
+        if cndx.get(k) is None:
             cndx[k] = n
             width = default_widths[k]
-            asc = "ascending" == default_sort_directions[k]
+            asc = default_sort_directions[k] == "ascending"
 
         lsvp["columns"][columns[column]] = {
             "index": n,
@@ -453,7 +460,7 @@ def roundup(x, n):
                 path = path[0]
 
             if not os.path.islink(path) and os.path.isdir(path):
-                for dirpath, dirnames, filenames in os.walk(path):
+                for dirpath, _dirnames, filenames in os.walk(path):
                     for f in filenames:
                         fp = os.path.join(dirpath, f)
                         total_size += roundup(os.lstat(fp).st_size, 4096)
@@ -566,8 +573,6 @@ def roundup(x, n):
         if icon or badge_icon:
             subprocess.call(["/usr/bin/SetFile", "-a", "C", mount_point])
 
-        background_bmk = None
-
         callback(
             {
                 "type": "operation::start",
@@ -627,8 +632,8 @@ def roundup(x, n):
                         except Exception as e:
                             output.seek(0)
                             raise ValueError(
-                                'unable to compile combined HiDPI file "%s" got error: %s\noutput: %s'
-                                % (background, str(e), output.read())
+                                f"unable to compile combined HiDPI file {background!r} "
+                                f"got error: {str(e)}\noutput: {output.read()}"
                             )
 
                 _, kind = os.path.splitext(background)
@@ -645,10 +650,9 @@ def roundup(x, n):
                         with open(path_in_image, "wb") as out_file:
                             out_file.write(in_file.read())
                 else:
-                    raise ValueError('background file "%s" not found' % background)
+                    raise ValueError(f'background file "{background}" not found')
 
             alias = Alias.for_file(path_in_image)
-            background_bmk = Bookmark.for_file(path_in_image)
 
             icvp["backgroundType"] = 2
             icvp["backgroundImageAlias"] = alias.to_bytes()
@@ -767,7 +771,7 @@ def roundup(x, n):
             }
         )
 
-        userfn = options.get("create_hook", None)
+        userfn = options.get("create_hook")
         if callable(userfn):
             userfn(mount_point, options)
 
@@ -785,8 +789,6 @@ def roundup(x, n):
             d["."]["bwsp"] = bwsp
             if include_icon_view_settings:
                 d["."]["icvp"] = icvp
-                if background_bmk:
-                    d["."]["pBBk"] = background_bmk
             if include_list_view_settings:
                 d["."]["lsvp"] = lsvp
             d["."]["icvl"] = icvl
@@ -819,7 +821,7 @@ def roundup(x, n):
     subprocess.check_call(("sync", "--file-system", mount_point))
 
     retry_time = 1
-    for tries in range(detach_retries):
+    for _ in range(detach_retries):
         callback(
             {
                 "type": "command::start",
@@ -833,8 +835,8 @@ def roundup(x, n):
             {
                 "type": "command::finished",
                 "command": "hdiutil::detach",
-                "ret:": ret,
-                "output:": output,
+                "ret": ret,
+                "output": output,
             }
         )