Fixed broken handling of dirpath

rrgeorge · Nov 16, 2021 · 6af3720 · 6af3720
1 parent 4bbc421
commit 6af3720
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/foundrytoencounter.py b/foundrytoencounter.py
@@ -24,7 +24,7 @@
 from google.protobuf import text_format
 import fonts_public_pb2
 
-VERSION = "1.13.4"
+VERSION = "1.13.5"
 
 zipfile.ZIP64_LIMIT = 4294967294
 PIL.Image.MAX_IMAGE_PIXELS = 200000000
@@ -1628,7 +1628,7 @@ def progress(block_num, block_size, total_size):
                 )
                 if any(x.startswith("{}/".format(mod["name"])) for x in z.namelist()):
                     pack["path"] = mod["name"] + "/" + pack["path"]
-                if dirpath and any(x.startswith("{}/".format(dirpath)) for x in z.namelist()):
+                if dirpath and not pack["path"].startswith("{}/".format(dirpath)) and any(x.startswith("{}/".format(dirpath)) for x in z.namelist()):
                     pack["path"] = dirpath + "/" + pack["path"]
                 if pack["path"].startswith("./") and dirpath:
                     pack["path"] = dirpath + pack["path"][1:]