instsetoo_native/util/openoffice.lst.in | 2 +- solenv/bin/ooinstall | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit bb521b96c4d60c7f672df7bb301a2d5908af52f3 Author: Tor Lillqvist <[email protected]> Date: Fri Jul 29 19:03:50 2016 +0300 s/LibreOffice/Collabora Office/ for the product name in one more place Otherwise I get: ERROR: Product Collabora Office not defined in /Users/tml/lo/co-5.1/instsetoo_native/util/openoffice.lst at /Users/tml/lo/co-5.1/solenv/bin/modules/installer/ziplist.pm line 150. Change-Id: Ibd38e8f081c883ceb393896c0ac35c9be0260847 diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index b858b29..505c1a4 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -39,7 +39,7 @@ Globals } } -LibreOffice +Collabora Office { Settings { commit 21b32773c75d68e926d693e8be931b2ca96f4d89 Author: Tor Lillqvist <[email protected]> Date: Fri Jul 29 18:59:45 2016 +0300 Quote the product name as it might contain spaces Otherwise we get "ERROR: unknown parameter: Office" for a product called Collabora Office, for instance. Change-Id: Iec99a3eb0848c34861be03ab6036aed707b20ac4 diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall index f9034cd..d5aa342 100755 --- a/solenv/bin/ooinstall +++ b/solenv/bin/ooinstall @@ -93,7 +93,7 @@ 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 \"$ENV{PRODUCTNAME}\"" . " " . "-u $tmp_dir " . "-buildid $BUILD $destdir $strip $msi " . "-simple $path") && die "Failed to install: $!"; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
