WindowMaker installe OK

[hvlinux.git] / stage3 / cis-espgs

diff --git a/stage3/cis-espgs b/stage3/cis-espgs
index 656f9d0..2ae788b 100755 (executable)
--- a/stage3/cis-espgs
+++ b/stage3/cis-espgs
@@ -1,4 +1,6 @@
 #!/bin/sh
+set -o errexit
+
 # First argument of this script is the package name.
 
 # Reading system configuration informations, functions and package versions.
@@ -7,46 +9,44 @@ source ../functions
 source ../packages-list
 
 # Applying patches (if any)
-apply_patches ${1} &&
+apply_patches ${1}
 
 GS_FONTS_PATH="${HV_FONTS_PATH}/ghostscript"
 
 # Unpack all the fonts to ${GS_FONTS_PATH}
-install -v -m755 -d ${GS_FONTS_PATH} &&
-decompress_package ${GHOSTSCRIPT_FONTS_STD} &&
-decompress_package ${GHOSTSCRIPT_FONTS_OTHER} &&
-mv ${LFS_TMP}/fonts/* ${GS_FONTS_PATH} &&
-rmdir ${LFS_TMP}/fonts &&
-chown -v -R root:root ${GS_FONTS_PATH} &&
-
-cd ${LFS_TMP}/${1} &&
-sed -i "s/bbox.dev$/x11.dev/" Makefile.in &&
+install -v -m755 -d ${GS_FONTS_PATH}
+decompress_package ${GHOSTSCRIPT_FONTS_STD}
+decompress_package ${GHOSTSCRIPT_FONTS_OTHER}
+mv ${LFS_TMP}/fonts/* ${GS_FONTS_PATH}
+rmdir ${LFS_TMP}/fonts
+chown -v -R root:root ${GS_FONTS_PATH}
+
+cd ${LFS_TMP}/${1}
+sed -i "s/bbox.dev$/x11.dev/" Makefile.in
 ./configure \
     --prefix=/usr \
     --enable-threads \
     --without-omni \
-    --with-fontpath=${GS_FONTS_PATH} &&
-make &&
-make install &&
-#rmdir -v /usr/lib/ghostscript/$(get_pkg_ver_base ${1}) /usr/lib/ghostscript &&
-ln -v -s ../ghostscript/$(get_pkg_ver_base ${1})/doc /usr/share/doc/${1} &&
+    --with-fontpath=${GS_FONTS_PATH}
+make
+make install
+
+#rmdir -v /usr/lib/ghostscript/$(get_pkg_ver_base ${1}) /usr/lib/ghostscript
+ln -v -s ../ghostscript/$(get_pkg_ver_base ${1})/doc /usr/share/doc/${1}
 for INSTFILE in `ls doc`; do
     if [ ! -f /usr/share/doc/${1}/${INSTFILE} ]; then
        install -v -m644 doc/${INSTFILE} /usr/share/doc/${1}/
     fi
-done &&
-
-# Checking if X is installed...
-if [ -d /usr/X11R6 ]; then
-    # Adding our local fonts directory to local configuration file
-    sed -i -e "s!^</fontconfig>!<dir>${GS_FONTS_PATH}</dir>\n</fontconfig>!" \
-       /etc/fonts/local.conf &&
-    
-    # Updating fonts cache database.
-    fc-cache -f
-fi &&
+done
+
+if ! grep "${GS_FONTS_PATH}" /etc/fonts/local.conf 1> /dev/null 2>&1; then
+    # Adding Ghostscript fonts directory to local configuration file
+    sed -i -e "s!\(</fontconfig>\)!    <dir>${GS_FONTS_PATH}</dir>\n\1!" /etc/fonts/local.conf
+fi
+
+# Updating cache database.
+fc-cache -f
 
 ldconfig
 
-# Return last error
 exit $?