mirror of
https://github.com/monitoring-plugins/monitoring-plugins.git
synced 2026-04-22 22:56:58 -04:00
If the TMPDIR environment variable is set, use that instead of "/tmp" as
the installation directory. git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1767 f882894a-f735-0410-b71e-b25c423dba1c
This commit is contained in:
parent
0a02314e8d
commit
ff8bf04d3a
1 changed files with 3 additions and 2 deletions
|
|
@ -21,6 +21,7 @@ chomp($myhost);
|
|||
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 make {
|
|||
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;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue