X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage4%2Fconfigure-fonts;h=7673a20f941133932c69ee5e42f9791167451677;hb=f4db17a468c2141d7cd0afb3f59f198c88f16dfc;hp=eab4954210bcf3a1f7f25abc60e17f1c0e2456d1;hpb=5837862ba64bfafa96ff8007aceed581d28fb133;p=hvlinux.git diff --git a/stage4/configure-fonts b/stage4/configure-fonts index eab4954..7673a20 100755 --- a/stage4/configure-fonts +++ b/stage4/configure-fonts @@ -1,25 +1,20 @@ -#!/bin/sh -set -o errexit +#!/bin/bash -# First argument of this script is the package name. - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list +source ../functions/main # When all of the fonts have been installed, the system must be configured so # that Fontconfig can find the TrueType fonts since they are outside of the # default search path of /usr/share/fonts. install -v -d -m755 /usr/share/fonts -ln -svfT ${XORG_PREFIX}/lib/X11/fonts/OTF /usr/share/fonts/X11-OTF -ln -svfT ${XORG_PREFIX}/lib/X11/fonts/TTF /usr/share/fonts/X11-TTF +ln -svfT /usr/lib/X11/fonts/OTF /usr/share/fonts/X11-OTF +ln -svfT /usr/lib/X11/fonts/TTF /usr/share/fonts/X11-TTF X11_FONTS_DIR="/usr/share/fonts/X11" -if ! grep "${X11_FONTS_DIR}" /etc/fonts/local.conf 1> /dev/null 2>&1; then +if ! grep -q "${X11_FONTS_DIR}" /etc/fonts/local.conf; then # Adding X fonts directory to local configuration file - sed -i -e "s!\(\)!