Ajout support pour archives xz, et ajout fonction pour vérifier qu'on est bien l...

[hvlinux.git] / stage4 / configure-fonts

diff --git a/stage4/configure-fonts b/stage4/configure-fonts
index 9b0caf4..7673a20 100755 (executable)
--- a/stage4/configure-fonts
+++ b/stage4/configure-fonts
@@ -1,8 +1,6 @@
 #!/bin/bash
 
-source ../config/sysinfos
-source ../functions
-source ../config/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
@@ -13,9 +11,10 @@ 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!\(</fontconfig>\)!    <dir>${X11_FONTS_DIR}</dir>\n\1!" /etc/fonts/local.conf
+    sed -i -e "s!\(</fontconfig>\)!    <dir>${X11_FONTS_DIR}</dir>\n\1!" \
+        /etc/fonts/local.conf
 fi
 
 # Updating cache database.