Corrections git man pages

[hvlinux.git] / stage3 / cis-docbook-xsl

diff --git a/stage3/cis-docbook-xsl b/stage3/cis-docbook-xsl
index 0484f3f..495fadd 100755 (executable)
--- a/stage3/cis-docbook-xsl
+++ b/stage3/cis-docbook-xsl
@@ -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,42 +9,41 @@ source ../functions
 source ../packages-list
 
 # Applying patches (if any)
-apply_patches ${1} &&
+apply_patches ${1}
 
-cd ${LFS_TMP}/${1} &&
-install -d /usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION} &&
-chown -R root:root . &&
+cd ${LFS_TMP}/${1}
+install -d /usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION}
+chown -R root:root .
 cp -af INSTALL VERSION common eclipse extensions fo html htmlhelp \
     images javahelp lib manpages params profiling template xhtml \
-    /usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION} &&
-install -d /usr/share/doc/xml &&
-cp -af doc/* /usr/share/doc/xml &&
-cd /usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION} &&
+    /usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION}
+install -d /usr/share/doc/xml
+cp -af doc/* /usr/share/doc/xml
+cd /usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION}
 sh INSTALL
-evaluate_retval
+
 if [ ! -f /etc/xml/catalog ]; then
-    mkdir -p /etc/xml || exit 1
-    xmlcatalog --noout --create /etc/xml/catalog || exit 1
+    mkdir -p /etc/xml
+    xmlcatalog --noout --create /etc/xml/catalog
 fi
 if [ ! -e /etc/xml/docbook ]; then
-    xmlcatalog --noout --create /etc/xml/docbook || exit 1
+    xmlcatalog --noout --create /etc/xml/docbook
 fi
 xmlcatalog --noout --add "rewriteSystem" \
     "http://docbook.sourceforge.net/release/xsl/current" \
-    "/usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION}" /etc/xml/catalog &&
+    "/usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION}" /etc/xml/catalog
 xmlcatalog --noout --add "rewriteURI" \
     "http://docbook.sourceforge.net/release/xsl/current" \
-    "/usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION}" /etc/xml/catalog &&
+    "/usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION}" /etc/xml/catalog
 xmlcatalog --noout --add "delegateSystem" \
     "http://docbook.sourceforge.net/release/xsl/" \
-    "file:///etc/xml/docbook" /etc/xml/catalog &&
+    "file:///etc/xml/docbook" /etc/xml/catalog
 xmlcatalog --noout --add "delegateURI" \
     "http://docbook.sourceforge.net/release/xsl/" \
-    "file:///etc/xml/docbook" /etc/xml/catalog &&
+    "file:///etc/xml/docbook" /etc/xml/catalog
 
 var_add_str "XML_CATALOG_FILES" /etc/profile \
-    "/usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION}/catalog.xml /etc/xml/catalog" &&
+    "/usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION}/catalog.xml /etc/xml/catalog"
 var_export  "XML_CATALOG_FILES" /etc/profile
 
-# Return last error
 exit $?