[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_setup.mk

[Stephan Bergmann (via logerrit)]

 instsetoo_native/CustomTarget_setup.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 046703b829db685d7e929a137088b06dbfef18fe
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Jan 22 13:47:47 2021 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Jan 22 17:16:18 2021 +0100

    Percent-encode spaces also on Linux etc.
    
    ...following up on 336a9ec1c4801ab57264b264ead90e5c14451230 "URI-encode spaces
    in PRODUCTNAME for UserInstallation"
    
    Change-Id: I73fadea567c8e26f6a337c094623fa83be1e2188
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109815
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Jenkins

diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
index 6feb5238664b..137489aee223 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -41,7 +41,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
 		&& echo 'InstallMode=<installmode>' \
 		&& echo 'ProductKey=$(PRODUCTNAME) $(PRODUCTVERSION)' \
 		$(if $(ENABLE_RELEASE_BUILD),\
-			&& echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out HAIKU MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]"),$(shell echo $(PRODUCTNAME) | sed -e 's/ /%20/g'))/4', \
+			&& echo 'UserInstallation=$$SYSUSERCONFIG/$(shell echo $(PRODUCTNAME) | sed -e 's/ /%20/g' $(if $(filter-out HAIKU MACOSX WNT,$(OS)),| tr "[:upper:]" "[:lower:]"))/4', \
 			&& echo 'UserInstallation=$$ORIGIN/..') \
 	) > $@
 	$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH)