X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage3%2Fcis-jadetex;h=4bcb07cb4d2270c3d8796fb52efe5f9af32329d9;hb=5b913b7b528bb69a0c90583b8776d6d26b9cb189;hp=c5a44c2ad752cf26f5a14e22dc4029caa30bb37b;hpb=16cc35ba4890382ee9368a176e4f5a7fa773b7a6;p=hvlinux.git

diff --git a/stage3/cis-jadetex b/stage3/cis-jadetex
index c5a44c2..4bcb07c 100755
--- a/stage3/cis-jadetex
+++ b/stage3/cis-jadetex
@@ -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,13 +9,13 @@ 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.orig -e "s/original texmf.cnf/modified texmf.cnf/" \
     -e "s/memory hog.../&\npool_size.context = 750000/" \
-    $(kpsewhich texmf.cnf) &&
-cat >> $(kpsewhich texmf.cnf) << "EOF" &&
+    $(kpsewhich texmf.cnf)
+cat >> $(kpsewhich texmf.cnf) << "EOF"
 
 % The following 3 sections added for JadeTeX
 
@@ -56,22 +58,22 @@ max_strings.pdfjadetex = 55000
 
 EOF
 
-LATEX_FMT_DIR="$(kpsewhich -expand-var '$TEXMFSYSVAR')/web2c" &&
-mv -v $(kpsewhich latex.fmt) $(kpsewhich latex.fmt).orig &&
-mv -v $LATEX_FMT_DIR/latex.log $LATEX_FMT_DIR/latex.log.orig &&
-fmtutil-sys --byfmt latex &&
+LATEX_FMT_DIR="$(kpsewhich -expand-var '$TEXMFSYSVAR')/web2c"
+mv -v $(kpsewhich latex.fmt) $(kpsewhich latex.fmt).orig
+mv -v $LATEX_FMT_DIR/latex.log $LATEX_FMT_DIR/latex.log.orig
+fmtutil-sys --byfmt latex
 
-make &&
+make
 
 install -v -m755 -d \
-    $(kpsewhich -expand-var '$TEXMFLOCAL')/tex/jadetex/config &&
+    $(kpsewhich -expand-var '$TEXMFLOCAL')/tex/jadetex/config
 install -v -m644 dsssl.def jadetex.ltx *.sty \
-    $(kpsewhich -expand-var '$TEXMFLOCAL')/tex/jadetex &&
+    $(kpsewhich -expand-var '$TEXMFLOCAL')/tex/jadetex
 install -v -m644 {,pdf}jadetex.ini \
-    $(kpsewhich -expand-var '$TEXMFLOCAL')/tex/jadetex/config &&
-FMTUTIL_CNF="$(kpsewhich fmtutil.cnf)" &&
-mv $FMTUTIL_CNF $FMTUTIL_CNF.orig &&
-cat $FMTUTIL_CNF.orig - >> $FMTUTIL_CNF << "EOF" &&
+    $(kpsewhich -expand-var '$TEXMFLOCAL')/tex/jadetex/config
+FMTUTIL_CNF="$(kpsewhich fmtutil.cnf)"
+mv $FMTUTIL_CNF $FMTUTIL_CNF.orig
+cat $FMTUTIL_CNF.orig - >> $FMTUTIL_CNF << "EOF"
 
 # JadeTeX formats:
 jadetex         etex            -               "&latex"     jadetex.ini
@@ -79,20 +81,19 @@ pdfjadetex      pdfetex         -               "&pdflatex"  pdfjadetex.ini
 
 EOF
 mv -v $(kpsewhich -expand-var '$TEXMFMAIN')/ls-R \
-    $(kpsewhich -expand-var '$TEXMFMAIN')/ls-R.orig &&
+    $(kpsewhich -expand-var '$TEXMFMAIN')/ls-R.orig
 mv -v $(kpsewhich -expand-var '$TEXMFSYSVAR')/ls-R \
-    $(kpsewhich -expand-var '$TEXMFSYSVAR')/ls-R.orig &&
-mktexlsr &&
-fmtutil-sys --byfmt jadetex &&
-fmtutil-sys --byfmt pdfjadetex &&
-mktexlsr &&
-ln -v -sf etex /usr/bin/jadetex &&
-ln -v -sf pdfetex /usr/bin/pdfjadetex &&
+    $(kpsewhich -expand-var '$TEXMFSYSVAR')/ls-R.orig
+mktexlsr
+fmtutil-sys --byfmt jadetex
+fmtutil-sys --byfmt pdfjadetex
+mktexlsr
+ln -v -sf etex /usr/bin/jadetex
+ln -v -sf pdfetex /usr/bin/pdfjadetex
 install -v -m644 -D index.html \
-    /usr/share/doc/jadetex-3.13/index.html &&
+    /usr/share/doc/jadetex-3.13/index.html
 install -v -m644 *.1 /usr/share/man/man1
 
 ldconfig
 
-# Return last error
 exit $?