tjh.dev
1--- a/vcs 2020-04-04 14:37:53.531095977 -0700
2+++ b/vcs 2020-04-04 14:40:46.459407878 -0700
3@@ -3669,18 +3669,8 @@
4 [[ ( -z $USR_FONT_TITLE ) && ( $FONT_TITLE != 'DejaVu-Sans-Book' ) ]] && return
5 [[ ( -z $USR_FONT_TSTAMPS ) && ( $FONT_TSTAMPS != 'DejaVu-Sans-Book' ) ]] && return
6 [[ ( -z $USR_FONT_SIGN ) && ( $FONT_SIGN != 'DejaVu-Sans-Book' ) ]] && return
7- # Try to locate DejaVu Sans
8- local dvs=''
9- if [[ -d /usr/local/share/fonts ]]; then
10- dvs=$(find /usr/local/share/fonts/ -type f -iname 'dejavusans.ttf')
11- fi
12- if [[ ( -z $dvs ) && ( -d /usr/share/fonts ) ]]; then
13- dvs=$(find /usr/share/fonts/ -type f -iname 'dejavusans.ttf')
14- fi
15- if [[ -z $dvs ]]; then
16- warn "Unable to locate DejaVu Sans font. Falling back to helvetica."
17- dvs=helvetica
18- fi
19+ # Use DejaVu Sans, by default
20+ local dvs='@dejavu_fonts@/share/fonts/truetype/DejaVuSans.ttf'
21 [[ -z $USR_FONT_HEADING ]] && FONT_HEADING="$dvs"
22 [[ -z $USR_FONT_TITLE ]] && FONT_TITLE="$dvs"
23 [[ -z $USR_FONT_TSTAMPS ]] && FONT_TSTAMPS="$dvs"