diff --git a/.gitignore b/.gitignore index 6b8ce08211..aa2533f1e1 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,7 @@ resources/viewer.html resources/content-server/index-generated.html resources/content-server/locales.zip resources/mathjax +resources/fonts/liberation resources/mozilla-ca-certs.pem resources/user-agent-data.json icons/icns/*.iconset diff --git a/setup/liberation.py b/setup/liberation.py index fc2ec01adb..d3d6f175a7 100644 --- a/setup/liberation.py +++ b/setup/liberation.py @@ -24,9 +24,10 @@ class LiberationFonts(ReVendor): def run(self, opts): self.clean() os.makedirs(self.vendored_dir) + self.use_symlinks = opts.system_liberation_fonts with self.temp_dir() as dl_src: - src = opts.path_to_hyphenation or self.download_vendor_release(dl_src, opts.hyphenation_url) - font_files = glob.glob(os.path.join(src, '*/Liberation*.ttf')) + src = opts.path_to_liberation_fonts or self.download_vendor_release(dl_src, opts.liberation_fonts_url) + font_files = glob.glob(os.path.join(src, 'Liberation*.ttf')) if not font_files: raise SystemExit(f'No font files found in {src}')