diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-11-22 21:05:48 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-06-11 19:43:00 +0200 |
| commit | 12d1b08aac8cc8c3176040efc7290377e380f0c4 (patch) | |
| tree | a5368f7126865d4ea9f1a5a3b251bb101d83d55d | |
| parent | 00d6704597b831fe7b5f1db8da55ee6fdb48f031 (diff) | |
Use the same solenv/bin/ooinstall as in the cp-5.3 branchcp-6.0-5
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.
(cherry picked from commit 852ffcae172c8ce1536f847410d94b6fcb486b96)
Change-Id: I9b2d84bcc18e21b325960f7057e259daa37234a5
Reviewed-on: https://gerrit.libreoffice.org/55640
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
| -rwxr-xr-x | solenv/bin/ooinstall | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall index 83507a7bf647..9495cb01a88b 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: $!"; |