Conversion errexit stage3

[hvlinux.git] / stage3 / cis-sgml-dtd3

diff --git a/stage3/cis-sgml-dtd3 b/stage3/cis-sgml-dtd3
index ebbcce2..7a5c2a6 100755 (executable)
--- a/stage3/cis-sgml-dtd3
+++ b/stage3/cis-sgml-dtd3
@@ -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,20 +9,20 @@ source ../functions
 source ../packages-list
 
 # Applying patches (if any)
-apply_patches ${1} &&
+apply_patches ${1}
 
-cd ${LFS_TMP}/${1} &&
+cd ${LFS_TMP}/${1}
 sed -i -e '/ISO 8879/d' \
     -e 's|DTDDECL "-//OASIS//DTD DocBook V3.1//EN"|SGMLDECL|g' \
-    docbook.cat &&
-install -d /usr/share/sgml/docbook/sgml-dtd-${SGML_DTD3_VER} &&
-chown -R root:root . &&
-install docbook.cat /usr/share/sgml/docbook/sgml-dtd-${SGML_DTD3_VER}/catalog &&
-cp -af *.dtd *.mod *.dcl /usr/share/sgml/docbook/sgml-dtd-${SGML_DTD3_VER} &&
+    docbook.cat
+install -d /usr/share/sgml/docbook/sgml-dtd-${SGML_DTD3_VER}
+chown -R root:root .
+install docbook.cat /usr/share/sgml/docbook/sgml-dtd-${SGML_DTD3_VER}/catalog
+cp -af *.dtd *.mod *.dcl /usr/share/sgml/docbook/sgml-dtd-${SGML_DTD3_VER}
 install-catalog --add /etc/sgml/sgml-docbook-dtd-${SGML_DTD3_VER}.cat \
-    /usr/share/sgml/docbook/sgml-dtd-${SGML_DTD3_VER}/catalog &&
+    /usr/share/sgml/docbook/sgml-dtd-${SGML_DTD3_VER}/catalog
 install-catalog --add /etc/sgml/sgml-docbook-dtd-${SGML_DTD3_VER}.cat \
-    /etc/sgml/sgml-docbook.cat &&
+    /etc/sgml/sgml-docbook.cat
 
 # Using only the most current 3.x version of sgml-dtd requires the following:
 cat >> /usr/share/sgml/docbook/sgml-dtd-${SGML_DTD3_VER}/catalog << "EOF"
@@ -31,5 +33,4 @@ PUBLIC "-//Davenport//DTD DocBook V3.0//EN" "docbook.dtd"
   -- End Single Major Version catalog changes --
 EOF
 
-# Return last error
 exit $?