From: hugo <hugo@364a67c3-989e-7be9-548d-dae8560ea662>
Date: Wed, 10 Feb 2010 06:38:32 +0000 (+0000)
Subject: Ajout variable manquante HV_FONTS_DIR
X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=5b913b7b528bb69a0c90583b8776d6d26b9cb189;p=hvlinux.git

Ajout variable manquante HV_FONTS_DIR
---

diff --git a/functions b/functions
index 5d7d083..4f58faf 100644
--- a/functions
+++ b/functions
@@ -22,6 +22,8 @@ BRACKET="\033[1;34m"
 
 TAR_OPTS="-b8"
 
+HV_FONTS_PATH="/usr/share/fonts"
+
 # It seems that when compiling bash-4.0, using
 # "make -j 1" is causing problems...
 if [ "x${MAKEJOBS}" = "x1" ]; then
diff --git a/stage3/cis-fontconfig b/stage3/cis-fontconfig
index d0bdead..6d613d5 100755
--- a/stage3/cis-fontconfig
+++ b/stage3/cis-fontconfig
@@ -8,6 +8,11 @@ source ../sysinfos
 source ../functions
 source ../packages-list
 
+if [ -z "${HV_FONTS_PATH}" ]; then
+    echo "Missing HV_FONTS_PATH environment variable"
+    exit 1
+fi
+
 # Applying patches (if any)
 apply_patches ${1}
 
diff --git a/sysinfos.server b/sysinfos.server
index a430a17..569fa9d 100644
--- a/sysinfos.server
+++ b/sysinfos.server
@@ -41,8 +41,6 @@ SOUND_CARD="no"
 CDROM="/dev/hdc"
 DVD="/dev/hdc"
 
-HV_FONTS_PATH="/usr/share/fonts"
-
 # Define this if you want to use a remote CUPS print server
 #CUPS_SERVER="server.hugovil.com"
 
diff --git a/sysinfos.workstn b/sysinfos.workstn
index 0118e68..89e00c0 100644
--- a/sysinfos.workstn
+++ b/sysinfos.workstn
@@ -44,8 +44,6 @@ SOUND_CARD="yes"
 CDROM="/dev/hdc"
 DVD="/dev/hdc"
 
-HV_FONTS_PATH="/usr/share/fonts"
-
 #--------------------
 # SCANNER definitions
 #--------------------