Date: Mon, 24 Sep 2012 14:54:28 +0000 (UTC) From: Dag-Erling Smørgrav <des@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r240886 - user/des/tinderbox Message-ID: <201209241454.q8OEsS3f039265@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209241454.q8OEsS3f039265>