Date: Tue, 30 Aug 2005 17:13:14 GMT From: soc-saturnero <soc-saturnero@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 82855 for review Message-ID: <200508301713.j7UHDE9V096501@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=82855 Change 82855 by soc-saturnero@soc-saturnero_sberta on 2005/08/30 17:13:06 Explicitly add set -e -u on top of every script Suggested by: Marco Molteni <molter at tin.it> Affected files ... .. //depot/projects/soc2005/freesbie/scripts/buildkernel.sh#4 edit .. //depot/projects/soc2005/freesbie/scripts/buildworld.sh#5 edit .. //depot/projects/soc2005/freesbie/scripts/cleandir.sh#2 edit .. //depot/projects/soc2005/freesbie/scripts/clonefs.sh#4 edit .. //depot/projects/soc2005/freesbie/scripts/extra.sh#2 edit .. //depot/projects/soc2005/freesbie/scripts/flash.sh#3 edit .. //depot/projects/soc2005/freesbie/scripts/img.sh#5 edit .. //depot/projects/soc2005/freesbie/scripts/installkernel.sh#3 edit .. //depot/projects/soc2005/freesbie/scripts/installworld.sh#2 edit .. //depot/projects/soc2005/freesbie/scripts/iso.sh#3 edit .. //depot/projects/soc2005/freesbie/scripts/pkginstall.sh#3 edit .. //depot/projects/soc2005/freesbie/scripts/pkgselect.sh#3 edit Differences ... ==== //depot/projects/soc2005/freesbie/scripts/buildkernel.sh#4 (text+ko) ==== @@ -6,6 +6,8 @@ # # $FreeBSD$ +set -e -u + if [ -z "${LOGFILE:-}" ]; then echo "This script can't run standalone." echo "Please use launch.sh to execute it." ==== //depot/projects/soc2005/freesbie/scripts/buildworld.sh#5 (text+ko) ==== @@ -6,6 +6,8 @@ # # $FreeBSD$ +set -e -u + if [ -z "${LOGFILE:-}" ]; then echo "This script can't run standalone." echo "Please use launch.sh to execute it." ==== //depot/projects/soc2005/freesbie/scripts/cleandir.sh#2 (text+ko) ==== @@ -6,6 +6,8 @@ # # $FreeBSD$ +set -e -u + if [ -z "${LOGFILE:-}" ]; then echo "This script can't run standalone." echo "Please use launch.sh to execute it." @@ -22,4 +24,4 @@ if [ -d "${CLONEDIR}" ]; then chflags -R noschg ${CLONEDIR} rm -rf ${CLONEDIR} -fi+fi ==== //depot/projects/soc2005/freesbie/scripts/clonefs.sh#4 (text+ko) ==== @@ -6,6 +6,8 @@ # # $FreeBSD$ +set -e -u + if [ -z "${LOGFILE:-}" ]; then echo "This script can't run standalone." echo "Please use launch.sh to execute it." @@ -170,4 +172,4 @@ clone_system -cd ${LOCALDIR}+cd ${LOCALDIR} ==== //depot/projects/soc2005/freesbie/scripts/extra.sh#2 (text+ko) ==== @@ -6,6 +6,8 @@ # # $FreeBSD$ +set -e -u + if [ -z "${LOGFILE:-}" ]; then echo "This script can't run standalone." echo "Please use launch.sh to execute it." ==== //depot/projects/soc2005/freesbie/scripts/flash.sh#3 (text+ko) ==== @@ -6,6 +6,8 @@ # # $FreeBSD$ +set -e -u + if [ -z "${LOGFILE:-}" ]; then echo "This script can't run standalone." echo "Please use launch.sh to execute it." ==== //depot/projects/soc2005/freesbie/scripts/img.sh#5 (text+ko) ==== @@ -6,6 +6,8 @@ # # $FreeBSD$ +set -e -u + if [ -z "${LOGFILE:-}" ]; then echo "This script can't run standalone." echo "Please use launch.sh to execute it." ==== //depot/projects/soc2005/freesbie/scripts/installkernel.sh#3 (text+ko) ==== @@ -6,6 +6,8 @@ # # $FreeBSD$ +set -e -u + if [ -z "${LOGFILE:-}" ]; then echo "This script can't run standalone." echo "Please use launch.sh to execute it." ==== //depot/projects/soc2005/freesbie/scripts/installworld.sh#2 (text+ko) ==== @@ -6,6 +6,8 @@ # # $FreeBSD$ +set -e -u + if [ -z "${LOGFILE:-}" ]; then echo "This script can't run standalone." echo "Please use launch.sh to execute it." @@ -33,4 +35,4 @@ (script -aq $LOGFILE make ${MAKEOPT:-} distribution __MAKE_CONF=${MAKE_CONF} TARGET_ARCH=${ARCH} DESTDIR=${BASEDIR} || print_error;) | grep '^>>>' -cd $LOCALDIR+cd $LOCALDIR ==== //depot/projects/soc2005/freesbie/scripts/iso.sh#3 (text+ko) ==== @@ -6,6 +6,8 @@ # # $FreeBSD$ +set -e -u + if [ -z "${LOGFILE:-}" ]; then echo "This script can't run standalone." echo "Please use launch.sh to execute it." @@ -44,7 +46,7 @@ echo "Running mkisofs..." -mkisofs -b boot/cdboot -no-emul-boot -r -ldots -l -L -V ${LABEL} -p FreeSBIE -o $ISOPATH . >> ${LOGFILE} 2>&1 +mkisofs -b boot/cdboot -no-emul-boot -J -r -ldots -l -L -V ${LABEL} -p FreeSBIE -o $ISOPATH . >> ${LOGFILE} 2>&1 echo "ISO created:" ==== //depot/projects/soc2005/freesbie/scripts/pkginstall.sh#3 (text+ko) ==== @@ -6,6 +6,8 @@ # # $FreeBSD$ +set -e -u + if [ -z "${LOGFILE:-}" ]; then echo "This script can't run standalone." echo "Please use launch.sh to execute it." ==== //depot/projects/soc2005/freesbie/scripts/pkgselect.sh#3 (text+ko) ==== @@ -6,6 +6,8 @@ # # $FreeBSD$ +set -e -u + if [ -z "${LOGFILE:-}" ]; then echo "This script can't run standalone." echo "Please use launch.sh to execute it."
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200508301713.j7UHDE9V096501>