Conversion errexit stage3

[hvlinux.git] / stage3 / cis-fontconfig

diff --git a/stage3/cis-fontconfig b/stage3/cis-fontconfig
index b2e1e0d..d0bdead 100755 (executable)
--- a/stage3/cis-fontconfig
+++ b/stage3/cis-fontconfig
@@ -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,32 +9,32 @@ source ../functions
 source ../packages-list
 
 # Applying patches (if any)
-apply_patches ${1} &&
+apply_patches ${1}
 
-cd ${LFS_TMP}/${1}-build &&
+cd ${LFS_TMP}/${1}-build
 ../${1}/configure \
     --prefix=/usr \
     --sysconfdir=/etc \
-    --disable-docs &&
-make &&
-make install &&
+    --disable-docs
+make
+make install
 # Manually installing documentation.
-cd ${LFS_TMP}/${1} &&
-install -v -m644 doc/*.3 /usr/share/man/man3 &&
-install -v -m644 doc/*.5 /usr/share/man/man5 &&
-install -v -m755 -d /usr/share/doc/${1}/fontconfig-devel &&
-install -v -m644 doc/*.{html,pdf,txt} /usr/share/doc/${1} &&
-install -v -m644 doc/fontconfig-devel/* /usr/share/doc/${1}/fontconfig-devel &&
+cd ${LFS_TMP}/${1}
+install -v -m644 doc/*.3 /usr/share/man/man3
+install -v -m644 doc/*.5 /usr/share/man/man5
+install -v -m755 -d /usr/share/doc/${1}/fontconfig-devel
+install -v -m644 doc/*.{html,pdf,txt} /usr/share/doc/${1}
+install -v -m644 doc/fontconfig-devel/* /usr/share/doc/${1}/fontconfig-devel
 
-mkdir -v -p ${HV_FONTS_PATH}/{TrueType,Type1} &&
-mkdir -v -p /etc/fonts &&
+mkdir -v -p ${HV_FONTS_PATH}/{TrueType,Type1}
+mkdir -v -p /etc/fonts
 
 if [ -f /etc/fonts/local.conf ]; then
-    mv -v /etc/fonts/local.conf /etc/fonts/local.conf.old || exit 1
-fi &&
+    mv -v /etc/fonts/local.conf /etc/fonts/local.conf.old
+fi
 
 # Adding X and our local fonts directory to local configuration file
-cat > /etc/fonts/local.conf << "EOF" &&
+cat > /etc/fonts/local.conf << "EOF"
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <!-- /etc/fonts/local.conf file for local customizations -->
@@ -44,10 +46,9 @@ cat > /etc/fonts/local.conf << "EOF" &&
 </fontconfig>
 EOF
 
-sed -i -e "s!_HV_FONTS_PATH_!${HV_FONTS_PATH}!g" /etc/fonts/local.conf &&
+sed -i -e "s!_HV_FONTS_PATH_!${HV_FONTS_PATH}!g" /etc/fonts/local.conf
 
 # Updating cache database.
 fc-cache -f
 
-# Return last error
 exit $?