From owner-p4-projects@FreeBSD.ORG Tue Aug 30 17:13:15 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 328CE16A423; Tue, 30 Aug 2005 17:13:15 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 056EC16A420 for ; Tue, 30 Aug 2005 17:13:15 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9E0F143D48 for ; Tue, 30 Aug 2005 17:13:14 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7UHDE8D096504 for ; Tue, 30 Aug 2005 17:13:14 GMT (envelope-from soc-saturnero@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7UHDE9V096501 for perforce@freebsd.org; Tue, 30 Aug 2005 17:13:14 GMT (envelope-from soc-saturnero@freebsd.org) Date: Tue, 30 Aug 2005 17:13:14 GMT Message-Id: <200508301713.j7UHDE9V096501@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-saturnero@freebsd.org using -f From: soc-saturnero To: Perforce Change Reviews Cc: Subject: PERFORCE change 82855 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Aug 2005 17:13:16 -0000 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 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."