Derive output directory defaults from outputDir, fixes #846

googlefonts · Mar 8, 2024 · ed030d9 · ed030d9
1 parent 8b97982
commit ed030d9
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/Lib/gftools/builder/recipeproviders/googlefonts.py b/Lib/gftools/builder/recipeproviders/googlefonts.py
@@ -24,10 +24,10 @@
 # Taken from gftools-builder
 DEFAULTS = {
     "outputDir": "../fonts",
-    "vfDir": "../fonts/variable",
-    "ttDir": "../fonts/ttf",
-    "otDir": "../fonts/otf",
-    "woffDir": "../fonts/webfonts",
+    "vfDir": "$outputDir/variable",
+    "ttDir": "$outputDir/ttf",
+    "otDir": "$outputDir/otf",
+    "woffDir": "$outputDir/webfonts",
     "buildStatic": True,
     "buildOTF": True,
     "buildTTF": True,
@@ -58,6 +58,8 @@ def write_recipe(self):
         self.config.revalidate(GOOGLEFONTS_SCHEMA)
 
         self.config = {**DEFAULTS, **self.config}
+        for field in ["vfDir", "ttDir", "otDir", "woffDir"]:
+            self.config[field] = self.config[field].replace("$outputDir", self.config["outputDir"])
         self.config["buildWebfont"] = self.config.get(
             "buildWebfont", self.config.get("buildStatic", True)
         )