diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-11-22 21:05:48 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2023-02-10 08:48:39 +0000 |
| commit | cbac6b9d8f1319fffc66b397dfa20588e35c24fb (patch) | |
| tree | ff98096390d51d6a9b8ca421bb14cf260f99db90 /solenv | |
| parent | b8a3d1b7577adce9e4844f6f8915820b98b6d2d8 (diff) | |
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.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 12d1b08aac8cc8c3176040efc7290377e380f0c4)
Reviewed-on: https://gerrit.libreoffice.org/79128
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
(cherry picked from commit 0069417b55c99166aec5489ccef803eba25d2b4f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136842
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146741
Tested-by: Jenkins
Diffstat (limited to 'solenv')
| -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 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: $!"; |