From 010a2a8ed3214380d514be56171c974f99010bc1 Mon Sep 17 00:00:00 2001
From: Jan Holesovsky <kendy@collabora.com>
Date: Tue, 2 Aug 2016 09:15:37 +0100
Subject: Don't use spaces in the product names when packaging.

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

(limited to 'solenv')

diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index f9034cdc6c78..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: $!";
-- 
cgit