summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2017-11-22 21:05:48 +0200
committerTor Lillqvist <tml@collabora.com>2017-11-22 21:07:40 +0200
commit852ffcae172c8ce1536f847410d94b6fcb486b96 (patch)
tree993ffe6867b6c149bbd5d9d5c870a0300875e631
parent2cfe8412300a9ffe68228e0faf2c36eb1037cb6b (diff)
Use the same solenv/bin/ooinstall as in the cp-5.1 branch
Specifically, pass the correct product name and not a hardcoded "LibreOffice" for the make_installer.pl script's -p option. As such, instsetoo_native/util/openoffice.lst.in hardcodes the product name as "CollaboraOffice" so we could as well do that also in ooinstall. Change-Id: I9b2d84bcc18e21b325960f7057e259daa37234a5
-rwxr-xr-xsolenv/bin/ooinstall5
1 files changed, 4 insertions, 1 deletions
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 8d0f5be27512..edd3d83f2c4b 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -89,11 +89,14 @@ if ($destdir && "$ENV{DESTDIR}" ne "/" && -d "$ENV{DESTDIR}") {
print "Running LibreOffice installer\n";
+my $PRODUCTNAME_no_spaces = $ENV{PRODUCTNAME};
+$PRODUCTNAME_no_spaces =~ s/ //g;
+
system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
"perl " .
(scalar keys(%DB::sub) ? "-d " : "") .
"-w $ENV{SRCDIR}/solenv/bin/make_installer.pl " .
- "-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p LibreOffice " .
+ "-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p $PRODUCTNAME_no_spaces " .
"-u $tmp_dir " .
"-buildid $BUILD $destdir $strip $msi " .
"-simple $path") && die "Failed to install: $!";