From owner-svn-src-user@FreeBSD.ORG  Mon Sep 24 14:54:28 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 882F41065670;
	Mon, 24 Sep 2012 14:54:28 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 741038FC08;
	Mon, 24 Sep 2012 14:54:28 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8OEsSTB039267;
	Mon, 24 Sep 2012 14:54:28 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8OEsS3f039265;
	Mon, 24 Sep 2012 14:54:28 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201209241454.q8OEsS3f039265@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Mon, 24 Sep 2012 14:54:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240886 - user/des/tinderbox
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Sep 2012 14:54:28 -0000

Author: des
Date: Mon Sep 24 14:54:27 2012
New Revision: 240886
URL: http://svn.freebsd.org/changeset/base/240886

Log:
  Use $unamecmd instead of hardcoding it all over the place.

Modified:
  user/des/tinderbox/tinderbox.pl

Modified: user/des/tinderbox/tinderbox.pl
==============================================================================
--- user/des/tinderbox/tinderbox.pl	Mon Sep 24 08:32:19 2012	(r240885)
+++ user/des/tinderbox/tinderbox.pl	Mon Sep 24 14:54:27 2012	(r240886)
@@ -77,6 +77,8 @@ my %lint;
 
 my $starttime;
 
+my $unamecmd = '/usr/bin/uname';
+
 my @cvscmds = (
     '/usr/bin/cvs',
     '/usr/local/bin/cvs',
@@ -418,7 +420,7 @@ MAIN:{
     tzset();
 
     # Set defaults
-    $hostname = `/usr/bin/uname -n`;
+    $hostname = `$unamecmd -n`;
     chomp($hostname);
     $branch = "HEAD";
     $jobs = 0;
@@ -457,10 +459,10 @@ MAIN:{
     }
     $branch = ($1 eq 'CURRENT') ? 'HEAD' : $1;
     if (!defined($arch)) {
-	$arch = `/usr/bin/uname -p`;
+	$arch = `$unamecmd -p`;
 	chomp($arch);
 	if (!defined($machine)) {
-	    $machine = `/usr/bin/uname -m`;
+	    $machine = `$unamecmd -m`;
 	    chomp($machine);
 	}
     }
@@ -526,7 +528,7 @@ MAIN:{
     open(STDERR, ">&STDOUT");
     $| = 1;
     logstage("tinderbox $VERSION running on $hostname");
-    logstage(`/usr/bin/uname -a`);
+    logstage(`$unamecmd -a`);
     logstage("starting $branch tinderbox run for $arch/$machine");
     $SIG{__DIE__} = \&sigdie;
     $SIG{__WARN__} = \&sigwarn;