[Libreoffice-commits] core.git: solenv/bin

[Tor Lillqvist (via logerrit)]

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

New commits:
commit cbac6b9d8f1319fffc66b397dfa20588e35c24fb
Author:     Tor Lillqvist <t...@collabora.com>
AuthorDate: Wed Nov 22 21:05:48 2017 +0200
Commit:     Tor Lillqvist <t...@collabora.com>
CommitDate: Fri Feb 10 08:48:39 2023 +0000

    Pass product name and not hardcoded "LibreOffice" to make_installer.pl -p
    
    Change-Id: I9b2d84bcc18e21b325960f7057e259daa37234a5
    Reviewed-on: https://gerrit.libreoffice.org/55640
    Reviewed-by: Andras Timar <andras.ti...@collabora.com>
    Tested-by: Andras Timar <andras.ti...@collabora.com>
    (cherry picked from commit 12d1b08aac8cc8c3176040efc7290377e380f0c4)
    Reviewed-on: https://gerrit.libreoffice.org/79128
    Reviewed-by: Tor Lillqvist <t...@collabora.com>
    Tested-by: Tor Lillqvist <t...@collabora.com>
    (cherry picked from commit 0069417b55c99166aec5489ccef803eba25d2b4f)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136842
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146741
    Tested-by: Jenkins

diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index efb1f28de824..71f10c739036 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -88,11 +88,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: $!";