[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - solenv/bin

[Tor Lillqvist]

 solenv/bin/ooinstall |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 852ffcae172c8ce1536f847410d94b6fcb486b96
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Nov 22 21:05:48 2017 +0200

    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

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: $!";