Date: Fri, 5 Aug 2005 13:53:39 GMT From: soc-saturnero <soc-saturnero@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 81492 for review Message-ID: <200508051353.j75DrdQs086510@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=81492 Change 81492 by soc-saturnero@soc-saturnero_sberta on 2005/08/05 13:53:20 - Remove ${LOGFILE} if it's a temporary file - Use return instead of exit, if exiting cleanly Affected files ... .. //depot/projects/soc2005/freesbie/scripts/buildkernel.sh#3 edit .. //depot/projects/soc2005/freesbie/scripts/buildworld.sh#4 edit .. //depot/projects/soc2005/freesbie/scripts/launch.sh#6 edit Differences ... ==== //depot/projects/soc2005/freesbie/scripts/buildkernel.sh#3 (text+ko) ==== @@ -16,7 +16,7 @@ if [ -n "${NO_BUILDKERNEL:-}" ]; then echo "NO_BUILDKERNEL set, skipping build" | tee -a ${LOGFILE} - exit + return fi # Set MAKE_CONF variable if it's not already set. ==== //depot/projects/soc2005/freesbie/scripts/buildworld.sh#4 (text+ko) ==== @@ -16,7 +16,7 @@ if [ -n "${NO_BUILDWORLD:-}" ]; then echo "NO_BUILDWORLD set, skipping build" | tee -a ${LOGFILE} - exit + return fi # Set MAKE_CONF variable if it's not already set. ==== //depot/projects/soc2005/freesbie/scripts/launch.sh#6 (text+ko) ==== @@ -25,10 +25,14 @@ TARGET=$1; shift; + +# Set LOGFILE. If it's a tmp file, schedule for deletion if [ -n "${1:-}" ]; then LOGFILE=${LOCALDIR}/$1 + REMOVELOG=0 else LOGFILE=$(mktemp -q /tmp/freesbie.XXXXXX) + REMOVELOG=1 fi . ./conf/freesbie.defaults.conf @@ -56,3 +60,7 @@ elif [ -f "${LOCALDIR}/scripts/${TARGET}.sh" ]; then . ${LOCALDIR}/scripts/${TARGET}.sh fi + +if [ ${REMOVELOG} -eq 1 ]; then + rm -f ${LOGFILE} +fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200508051353.j75DrdQs086510>