[Git][NTPsec/ntpsec][master] ntpviz: Also look in PREFIX for liberation font.

[Matt Selsky]

Matt Selsky pushed to branch master at NTPsec / ntpsec


Commits:
6b3175bb by Fred Wright at 2020-08-31T11:34:24-07:00
ntpviz: Also look in PREFIX for liberation font.

This looks in PREFIX before /usr, on the theory that any locally
installed version should be preferable.

TESTED:
With PREFIX set to /opt/local, now finds MacPorts-installed liberation
font.  The fallback also worked, so the only real effect in this case
is to get rid of the warning.

- - - - -


1 changed file:

- ntpclients/ntpviz.py


Changes:

=====================================
ntpclients/ntpviz.py
=====================================
@@ -1612,7 +1612,10 @@ Python by ESR, concept and gnuplot code by Dan Drown.
         if 2 < args.debug_level:
             sys.stderr.write("ntpviz: INFO: now running at nice: %s\n" % nice)
 
-    for fontpath in ("/usr/share/fonts/liberation",
+    for fontpath in ("@PREFIX@/share/fonts/liberation",
+                     "@PREFIX@/share/fonts/liberation-fonts",
+                     "@PREFIX@/share/fonts/truetype/liberation",
+                     "/usr/share/fonts/liberation",
                      "/usr/share/fonts/liberation-fonts",
                      "/usr/share/fonts/truetype/liberation"):
 



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/6b3175bbd1e21e48bbfc990e2425876d5e662569

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/6b3175bbd1e21e48bbfc990e2425876d5e662569
You're receiving this email because of your account on gitlab.com.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20200831/b4cffcb3/attachment-0001.htm>