diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2016-08-02 09:15:37 +0100 |
|---|---|---|
| committer | timar <timar@centos6-64bit.cbg.collabora.co.uk> | 2016-08-02 09:15:37 +0100 |
| commit | 4d1e53bcbd8af9655ea5d6b1cd5b03436b25feb7 (patch) | |
| tree | c88b2f06a62c3d6da6f37a1965100f176f77ce6d /solenv/bin/ooinstall | |
| parent | f59bad09088be0dca1f0975166c804f7bbaa25a0 (diff) | |
Don't use spaces in the product names when packaging.
cp-5.1-3
Change-Id: I55f332117cc7530eb6d562846db379d95e628a22
Diffstat (limited to 'solenv/bin/ooinstall')
| -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 d5aa3426e81c..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 \"$ENV{PRODUCTNAME}\"" . " " . + "-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: $!"; |