X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage3%2Fcis-docbook-xml;h=98a1f6b4663c773178ee1ebe3fc2d952cdd5fd1d;hb=425bbc4fed1d0106b78befe474328fb9f5a15334;hp=35acbdbeab6725f14ec1d039c367eef9eaaf7e76;hpb=16cc35ba4890382ee9368a176e4f5a7fa773b7a6;p=hvlinux.git

diff --git a/stage3/cis-docbook-xml b/stage3/cis-docbook-xml
index 35acbdb..98a1f6b 100755
--- a/stage3/cis-docbook-xml
+++ b/stage3/cis-docbook-xml
@@ -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,38 +9,38 @@ source ../functions
 source ../packages-list
 
 # Applying patches (if any)
-apply_patches ${1} &&
+apply_patches ${1}
 
-cd ${LFS_TMP}/${1} &&
-install -d -m755 /usr/share/xml/docbook/xml-dtd-${DOCBOOK_XML_VER} &&
-install -d -m755 /etc/xml &&
-chown -R root:root . &&
+cd ${LFS_TMP}/${1}
+install -d -m755 /usr/share/xml/docbook/xml-dtd-${DOCBOOK_XML_VER}
+install -d -m755 /etc/xml
+chown -R root:root .
 cp -af docbook.cat *.dtd ent/ *.mod \
-    /usr/share/xml/docbook/xml-dtd-${DOCBOOK_XML_VER} &&
+    /usr/share/xml/docbook/xml-dtd-${DOCBOOK_XML_VER}
 
 if [ ! -e /etc/xml/docbook ]; then
-    xmlcatalog --noout --create /etc/xml/docbook || exit 1
-fi &&
+    xmlcatalog --noout --create /etc/xml/docbook
+fi
 xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook XML V${DOCBOOK_XML_VER}//EN" \
     "http://www.oasis-open.org/docbook/xml/${DOCBOOK_XML_VER}/docbookx.dtd" \
-    /etc/xml/docbook &&
+    /etc/xml/docbook
 xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook XML CALS Table Model V${DOCBOOK_XML_VER}//EN" \
     "file:///usr/share/xml/docbook/xml-dtd-${DOCBOOK_XML_VER}/calstblx.dtd" \
-    /etc/xml/docbook &&
+    /etc/xml/docbook
 xmlcatalog --noout --add "public" \
     "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
     "file:///usr/share/xml/docbook/xml-dtd-${DOCBOOK_XML_VER}/soextblx.dtd" \
-    /etc/xml/docbook &&
+    /etc/xml/docbook
 xmlcatalog --noout --add "public" \
     "-//OASIS//ELEMENTS DocBook XML Information Pool V${DOCBOOK_XML_VER}//EN" \
     "file:///usr/share/xml/docbook/xml-dtd-${DOCBOOK_XML_VER}/dbpoolx.mod" \
-    /etc/xml/docbook &&
+    /etc/xml/docbook
 xmlcatalog --noout --add "public" \
     "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V${DOCBOOK_XML_VER}//EN" \
     "file:///usr/share/xml/docbook/xml-dtd-${DOCBOOK_XML_VER}/dbhierx.mod" \
-    /etc/xml/docbook &&
+    /etc/xml/docbook
 xmlcatalog --noout --add "public" \
     "-//OASIS//ELEMENTS DocBook XML HTML Tables V${DOCBOOK_XML_VER}//EN" \
     "file:///usr/share/xml/docbook/xml-dtd-${DOCBOOK_XML_VER}/htmltblx.mod" \
@@ -46,67 +48,65 @@ xmlcatalog --noout --add "public" \
 xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Notations V${DOCBOOK_XML_VER}//EN" \
     "file:///usr/share/xml/docbook/xml-dtd-${DOCBOOK_XML_VER}/dbnotnx.mod" \
-    /etc/xml/docbook &&
+    /etc/xml/docbook
 xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Character Entities V${DOCBOOK_XML_VER}//EN" \
     "file:///usr/share/xml/docbook/xml-dtd-${DOCBOOK_XML_VER}/dbcentx.mod" \
-    /etc/xml/docbook &&
+    /etc/xml/docbook
 xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Additional General Entities V${DOCBOOK_XML_VER}//EN" \
     "file:///usr/share/xml/docbook/xml-dtd-${DOCBOOK_XML_VER}/dbgenent.mod" \
-    /etc/xml/docbook &&
+    /etc/xml/docbook
 xmlcatalog --noout --add "rewriteSystem" \
     "http://www.oasis-open.org/docbook/xml/${DOCBOOK_XML_VER}" \
     "file:///usr/share/xml/docbook/xml-dtd-${DOCBOOK_XML_VER}" \
-    /etc/xml/docbook &&
+    /etc/xml/docbook
 xmlcatalog --noout --add "rewriteURI" \
     "http://www.oasis-open.org/docbook/xml/${DOCBOOK_XML_VER}" \
     "file:///usr/share/xml/docbook/xml-dtd-${DOCBOOK_XML_VER}" \
-    /etc/xml/docbook &&
+    /etc/xml/docbook
 
 if [ ! -e /etc/xml/catalog ]; then
     xmlcatalog --noout --create /etc/xml/catalog
-fi &&
+fi
 xmlcatalog --noout --add "delegatePublic" \
     "-//OASIS//ENTITIES DocBook XML" \
     "file:///etc/xml/docbook" \
-    /etc/xml/catalog &&
+    /etc/xml/catalog
 xmlcatalog --noout --add "delegatePublic" \
     "-//OASIS//DTD DocBook XML" \
     "file:///etc/xml/docbook" \
-    /etc/xml/catalog &&
+    /etc/xml/catalog
 xmlcatalog --noout --add "delegateSystem" \
     "http://www.oasis-open.org/docbook/" \
     "file:///etc/xml/docbook" \
-    /etc/xml/catalog &&
+    /etc/xml/catalog
 xmlcatalog --noout --add "delegateURI" \
     "http://www.oasis-open.org/docbook/" \
     "file:///etc/xml/docbook" \
-    /etc/xml/catalog &&
+    /etc/xml/catalog
 
-for DTDVERSION in ${DOCBOOK_XML_VER_PREV}
-do
+for DTDVERSION in ${DOCBOOK_XML_VER_PREV}; do
   xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook XML V$DTDVERSION//EN" \
     "http://www.oasis-open.org/docbook/xml/$DTDVERSION/docbookx.dtd" \
-    /etc/xml/docbook &&
+    /etc/xml/docbook
   xmlcatalog --noout --add "rewriteSystem" \
     "http://www.oasis-open.org/docbook/xml/$DTDVERSION" \
     "file:///usr/share/xml/docbook/xml-dtd-${DOCBOOK_XML_VER}" \
-    /etc/xml/docbook &&
+    /etc/xml/docbook
   xmlcatalog --noout --add "rewriteURI" \
     "http://www.oasis-open.org/docbook/xml/$DTDVERSION" \
     "file:///usr/share/xml/docbook/xml-dtd-${DOCBOOK_XML_VER}" \
-    /etc/xml/docbook &&
+    /etc/xml/docbook
   xmlcatalog --noout --add "delegateSystem" \
     "http://www.oasis-open.org/docbook/xml/$DTDVERSION/" \
     "file:///etc/xml/docbook" \
-    /etc/xml/catalog &&
+    /etc/xml/catalog
   xmlcatalog --noout --add "delegateURI" \
     "http://www.oasis-open.org/docbook/xml/$DTDVERSION/" \
     "file:///etc/xml/docbook" \
     /etc/xml/catalog
 done
 
-# Return last error
 exit $?