Kaydet (Commit) 336a9ec1 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

URI-encode spaces in PRODUCTNAME for UserInstallation

Failing to do this caused a mysterious uncaught exception in gengal,
with no explanation printed. This turned out to be caused by the
'CONFIGURATION_LAYERS: missing ":"' exception thrown in configmgr,
which was caused by the unencoded space confusing the parsing of the
CONFIGURATION_LAYERS thing.

Change-Id: I9c91819906c2e0dd434d9f96a04bc14c0e0408ed
üst a4027856
...@@ -41,7 +41,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ ...@@ -41,7 +41,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'InstallMode=<installmode>' \ && echo 'InstallMode=<installmode>' \
&& echo 'ProductKey=$(PRODUCTNAME) $(PRODUCTVERSION)' \ && echo 'ProductKey=$(PRODUCTNAME) $(PRODUCTVERSION)' \
$(if $(ENABLE_RELEASE_BUILD),\ $(if $(ENABLE_RELEASE_BUILD),\
&& echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]"),$(PRODUCTNAME))/4', \ && echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]"),$(shell echo $(PRODUCTNAME) | sed -e 's/ /%20/g'))/4', \
&& echo 'UserInstallation=$$ORIGIN/..') \ && echo 'UserInstallation=$$ORIGIN/..') \
) > $@ ) > $@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment