From owner-p4-projects@FreeBSD.ORG  Fri Aug  5 13:53:40 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4235916A421; Fri,  5 Aug 2005 13:53:40 +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 1329716A41F
	for <perforce@freebsd.org>; Fri,  5 Aug 2005 13:53:40 +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 BBF9D43D46
	for <perforce@freebsd.org>; Fri,  5 Aug 2005 13:53:39 +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 j75Drdbq086513
	for <perforce@freebsd.org>; Fri, 5 Aug 2005 13:53:39 GMT
	(envelope-from soc-saturnero@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j75DrdQs086510
	for perforce@freebsd.org; Fri, 5 Aug 2005 13:53:39 GMT
	(envelope-from soc-saturnero@freebsd.org)
Date: Fri, 5 Aug 2005 13:53:39 GMT
Message-Id: <200508051353.j75DrdQs086510@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	soc-saturnero@freebsd.org using -f
From: soc-saturnero <soc-saturnero@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 81492 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Aug 2005 13:53:40 -0000

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