[Libreoffice-commits] .: solenv/bin

[Andras Timar]

 solenv/bin/ooinstall |   11 +++++++++++
 1 file changed, 11 insertions(+)

New commits:
commit 1e6d9399a569cebb3593ff18773881b7f5551aed
Author: Andras Timar <atimar at novell.com>
Date:   Wed Apr 27 15:44:27 2011 +0200

    use /tmp instead of /instsetoo_native/util for temporary files

diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 7ab12b9..79cb019 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: $!";
 }