X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;ds=sidebyside;f=stage4%2Fconfigure-fonts;h=6345568bebc4c3d182938e5ce16cfba77b0617a2;hb=8045c361a66f72b4dcaef6d3257a1acd0ac22adf;hp=eab4954210bcf3a1f7f25abc60e17f1c0e2456d1;hpb=5837862ba64bfafa96ff8007aceed581d28fb133;p=hvlinux.git diff --git a/stage4/configure-fonts b/stage4/configure-fonts index eab4954..6345568 100755 --- a/stage4/configure-fonts +++ b/stage4/configure-fonts @@ -1,25 +1,13 @@ -#!/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 - -# 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 +source ../functions/main 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!\(\)!