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

diff --git a/stage3/cis-nss b/stage3/cis-nss
index 5dea3fe..41f8a9c 100755
--- a/stage3/cis-nss
+++ b/stage3/cis-nss
@@ -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,33 +9,33 @@ source ../functions
 source ../packages-list
 
 # Applying patches (if any)
-apply_patches ${1} &&
+apply_patches ${1}
 
 # Define to 1 to test this package.
 RUN_TESTS=0
 
-cd ${LFS_TMP}/${1} &&
-export WORKINGDIR=${PWD} &&
+cd ${LFS_TMP}/${1}
+export WORKINGDIR=${PWD}
 
 # Non-debug optimized build
-export BUILD_OPT=1 &&
+export BUILD_OPT=1
 
-cd mozilla/security/nss &&
-make nss_build_all &&
+cd mozilla/security/nss
+make nss_build_all
 
-cd ../.. &&
+cd ../..
 
-export NSS_LINUXDIR=$(basename `ls -d $WORKINGDIR/mozilla/dist/Linux*`) || exit 1
+export NSS_LINUXDIR=$(basename `ls -d $WORKINGDIR/mozilla/dist/Linux*`)
 
 if [ ${RUN_TESTS} -eq 1 ]; then
     # Running tests
-    export DOMSUF="${DOMAIN}" &&
-    export PATH=$PATH:$WORKINGDIR/mozilla/dist/$NSS_LINUXDIR/bin &&
-    export TEST_RESULTSDIR=$WORKINGDIR/mozilla/tests_results/security &&
-    cd security/nss/tests &&
-    sed -i 's/gmake/make/' common/init.sh &&
-    ./all.sh &&
-    TEST_RESULTS=$(grep Passed $TEST_RESULTSDIR/$(hostname --short).1/results.html | wc -l) || exit 1
+    export DOMSUF="${DOMAIN}"
+    export PATH=$PATH:$WORKINGDIR/mozilla/dist/$NSS_LINUXDIR/bin
+    export TEST_RESULTSDIR=$WORKINGDIR/mozilla/tests_results/security
+    cd security/nss/tests
+    sed -i 's/gmake/make/' common/init.sh
+    ./all.sh
+    TEST_RESULTS=$(grep Passed $TEST_RESULTSDIR/$(hostname --short).1/results.html | wc -l)
     if [ ${TEST_RESULTS} -ne 770 ]; then
 	echo "Number of tests that passed: ${TEST_RESULTS}"
 	echo "Number of tests expected to pass: 770"
@@ -41,22 +43,21 @@ if [ ${RUN_TESTS} -eq 1 ]; then
     fi
 fi
 
-cd ${LFS_TMP}/${1}/mozilla &&
-install -v -m755 nsprpub/$NSS_LINUXDIR/config/nspr-config /usr/bin &&
-#install -v -m755 -d /usr/lib/pkgconfig &&
+cd ${LFS_TMP}/${1}/mozilla
+install -v -m755 nsprpub/$NSS_LINUXDIR/config/nspr-config /usr/bin
+#install -v -m755 -d /usr/lib/pkgconfig
 #install -v -m644 nsprpub/lib/pkgconfig/nspr.pc \
 #    security/nss/lib/pkgconfig/nss.pc \
-#   /usr/lib/pkgconfig &&
+#   /usr/lib/pkgconfig
 
-cd dist &&
-install -v -m755 $NSS_LINUXDIR/lib/*.so /usr/lib &&
-install -v -m644 $NSS_LINUXDIR/lib/{*.chk,libcrmf.a} /usr/lib &&
-install -v -m755 -d /usr/include/{nss,nspr} &&
-install -v -m644 {public,private}/nss/* /usr/include/nss &&
-cp -v -RL $NSS_LINUXDIR/include/* /usr/include/nspr &&
-chmod -v 644 /usr/include/nspr/prvrsion.h &&
+cd dist
+install -v -m755 $NSS_LINUXDIR/lib/*.so /usr/lib
+install -v -m644 $NSS_LINUXDIR/lib/{*.chk,libcrmf.a} /usr/lib
+install -v -m755 -d /usr/include/{nss,nspr}
+install -v -m644 {public,private}/nss/* /usr/include/nss
+cp -v -RL $NSS_LINUXDIR/include/* /usr/include/nspr
+chmod -v 644 /usr/include/nspr/prvrsion.h
 
 ldconfig
 
-# Return last error
 exit $?