[Nagiosplug-checkins] SF.net SVN: nagiosplug: [1767] nagiosplug/trunk/tools/tinderbox_build

hweiss at users.sourceforge.net hweiss at users.sourceforge.net
Fri Jul 27 17:49:02 CEST 2007


Revision: 1767
          http://nagiosplug.svn.sourceforge.net/nagiosplug/?rev=1767&view=rev
Author:   hweiss
Date:     2007-07-27 08:49:01 -0700 (Fri, 27 Jul 2007)

Log Message:
-----------
If the TMPDIR environment variable is set, use that instead of "/tmp" as
the installation directory.

Modified Paths:
--------------
    nagiosplug/trunk/tools/tinderbox_build

Modified: nagiosplug/trunk/tools/tinderbox_build
===================================================================
--- nagiosplug/trunk/tools/tinderbox_build	2007-07-26 17:32:37 UTC (rev 1766)
+++ nagiosplug/trunk/tools/tinderbox_build	2007-07-27 15:49:01 UTC (rev 1767)
@@ -21,6 +21,7 @@
 my ($host, $junk) = split(/\./, $myhost);
 	
 my $BuildAdministrator = $ENV{TINDERBOX_BUILD_ADMIN} || "$ENV{'USER'}\@$myhost";
+my $TmpDir = $ENV{TMPDIR} || "/tmp";
 
 #Default values of cmdline opts
 my $ReportStatus = 0;  # Do not send results to server
@@ -266,14 +267,14 @@
 sub maketest {
         # Tests
         print LOG "LANG=C make test 2>&1\n";
-        open( MAKE, "LANG=C make test && make install DESTDIR=/tmp/tinderbox_build.$$ && make install-strip DESTDIR=/tmp/tinderbox_build2.$$ 2>&1 |");
+        open( MAKE, "LANG=C make test && make install DESTDIR=$TmpDir/tinderbox_build.$$ && make install-strip DESTDIR=$TmpDir/tinderbox_build2.$$ 2>&1 |");
 	while ( <MAKE> ) {
 		print $_;
 		print LOG $_;
 	}
 	close( MAKE);
 	my $rc = $?;
-	system("rm -fr /tmp/tinderbox_build.$$ /tmp/tinderbox_build2.$$");
+	system("rm -fr $TmpDir/tinderbox_build.$$ $TmpDir/tinderbox_build2.$$");
 	return ! $rc;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Commits mailing list