diff options
| author | Andras Timar <atimar@novell.com> | 2011-04-27 15:44:27 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@novell.com> | 2011-04-27 15:46:38 +0200 |
| commit | 811560a41f0c63254a9070bd2b430069f56787b2 (patch) | |
| tree | b9325de7f29ba0ed2bf874b2ddbd13f54c28ef45 /solenv/bin/ooinstall | |
| parent | 881dcc4f2d7d0fc38bf57525ca97e575fba6693c (diff) | |
use /tmp instead of /instsetoo_native/util for temporary files
Diffstat (limited to 'solenv/bin/ooinstall')
| -rwxr-xr-x | solenv/bin/ooinstall | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall index 7ab12b95fdcd..79cb0194b1df 100755 --- a/solenv/bin/ooinstall +++ b/solenv/bin/ooinstall @@ -13,6 +13,15 @@ use Cwd; $path = ''; $do_link = 0; +my $tmp_dir; +if( defined($ENV{TMPDIR}) ) { + $tmp_dir = $ENV{TMPDIR}; +} elsif( defined($ENV{TMP}) ) { + $tmp_dir = $ENV{TMP}; +} else { + $tmp_dir = '/tmp'; +} +if (!-d $tmp_dir) {die "Set TMP or TMPDIR!\n";} # Workaround for system Mozilla if ( $ENV{'SYSTEM_MOZILLA'} eq 'YES' ) { @@ -82,6 +91,7 @@ print "Running OOo installer\n"; system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " . "perl -w $ENV{SOLARENV}/bin/make_installer.pl " . "-f openoffice.lst -l $langs -p LibreOffice " . + "-u $tmp_dir " . "-buildid $BUILD $destdir $strip " . "-simple $path") && die "Failed to install: $!"; @@ -90,6 +100,7 @@ if ($ENV{BUILD_TYPE} =~ m/ODK/) { system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " . "perl -w $ENV{SOLARENV}/bin/make_installer.pl " . "-f openoffice.lst -l en-US -p LibreOffice_SDK " . + "-u $tmp_dir " . "-buildid $BUILD $destdir $strip " . "-simple $path") && die "Failed to install: $!"; } |