diff options
| author | Yehoshua Pesach Wallach <yehoshuapw@gmail.com> | 2022-04-27 19:29:28 +0300 |
|---|---|---|
| committer | JF <JF002@users.noreply.github.com> | 2022-05-10 22:20:02 +0200 |
| commit | b6b322efddc3a2f952419a054256ed3354c5625c (patch) | |
| tree | 7f91cc2e526d24529d85d13f6298ccd2b1a93c5b /src | |
| parent | f7e8caa04ad7c29955e07e08af750a9453b67c61 (diff) | |
fontgen: remove advanced (format string, process as list) from patching
Diffstat (limited to 'src')
| -rw-r--r-- | src/displayapp/fonts/fonts.json | 2 | ||||
| -rwxr-xr-x | src/displayapp/fonts/generate.py | 13 |
2 files changed, 2 insertions, 13 deletions
diff --git a/src/displayapp/fonts/fonts.json b/src/displayapp/fonts/fonts.json index 1216472b..dfc10ad9 100644 --- a/src/displayapp/fonts/fonts.json +++ b/src/displayapp/fonts/fonts.json @@ -12,7 +12,7 @@ ], "bpp": 1, "size": 20, - "patches": ["{file}_zero.patch"] + "patches": ["jetbrains_mono_bold_20.c_zero.patch"] }, "jetbrains_mono_42": { "sources": [ diff --git a/src/displayapp/fonts/generate.py b/src/displayapp/fonts/generate.py index 801566b4..401d47ab 100755 --- a/src/displayapp/fonts/generate.py +++ b/src/displayapp/fonts/generate.py @@ -66,18 +66,7 @@ def main(): subprocess.check_call(line) if patches: for patch in patches: - try: - # Try and patch, if given a string - patch = patch.format(name=name, file=name+'.c') - subprocess.check_call(['/usr/bin/patch', name+'.c', patch]) - continue - except: pass - try: - # otherwise, assume a "advanced" patch, which is a list of strings. - patch = [arg.format(name=name, file=name+'.c') for arg in patch] - subprocess.check_call(patch) - except Exception as e: - sys.exit('Failed to patch using "{patch}"\n{err}'.format(patch=patch,err=e)) + subprocess.check_call(['/usr/bin/patch', name+'.c', patch]) |