diff options
| author | Thorsten Behrens <thorsten.behrens@cib.de> | 2019-06-11 01:24:26 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-06-17 13:15:52 +0200 |
| commit | 8ca91fcc894f921005b1e76a47c34e9230cb9071 (patch) | |
| tree | 7c2f24b185bdbfb6f9ab15dafe8236cd8534872b | |
| parent | c3c9324ceae2d4840f039dcf426df4a45d237424 (diff) | |
Some product-name-with-spaces fixes
- use productname var w/o space for config dir
..which also saves some duplicated code
- add hack to make rpmbuild get a proper build root
-> otherwise rpm BUILDROOT will contain spaces, and things break
at various places during packaging
Change-Id: I20229ce533913fa000978aa84b1a2a5d998da14d
| -rw-r--r-- | instsetoo_native/CustomTarget_install.mk | 2 | ||||
| -rw-r--r-- | instsetoo_native/CustomTarget_setup.mk | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/download.pm | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/setupscript.pm | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 016fbbd03abd..bd8a0f657cbd 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -59,7 +59,7 @@ export LOCAL_COMMON_OUT := $(instsetoo_OUT) instsetoo_native_WITH_LANG := en-US $(filter-out en-US,$(gb_WITH_LANG)) -PRODUCTNAME_no_spaces := $(subst $(WHITESPACE),,$(PRODUCTNAME)) +PRODUCTNAME_no_spaces := $(PRODUCTNAME_WITHOUT_SPACES) ifeq (WNT,$(OS)) define instsetoo_native_msitemplates diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index ec31d718a6a0..4d47d8d894e8 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -40,7 +40,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 MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]"),$(shell echo $(PRODUCTNAME) | sed -e 's/ /%20/g'))/4', \ + && echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME_WITHOUT_SPACES) | tr "[:upper:]" "[:lower:]"),$(PRODUCTNAME_WITHOUT_SPACES))/4', \ && echo 'UserInstallation=$$ORIGIN/..') \ ) > $@ diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm index 63103816e89f..c1776053ec1e 100644 --- a/solenv/bin/modules/installer/download.pm +++ b/solenv/bin/modules/installer/download.pm @@ -290,7 +290,7 @@ sub get_downloadname_productname my $start = ""; - $start = $allvariables->{'PRODUCTNAME'}; + $start = $allvariables->{'PRODUCTNAME'}; $start =~ s/ /_/g; return $start; } diff --git a/solenv/bin/modules/installer/setupscript.pm b/solenv/bin/modules/installer/setupscript.pm index 6eefe01f0bd5..4a5a1003cb3e 100644 --- a/solenv/bin/modules/installer/setupscript.pm +++ b/solenv/bin/modules/installer/setupscript.pm @@ -166,7 +166,7 @@ sub add_lowercase_productname_setupscriptvariable $newline = "\%MASKEDPRODUCTNAME " . $value . "\n"; push(@{$variablesref} ,$newline); $value = $original; - $value =~ s/\s/\_/g; + $value =~ s/\s//g; $newline = "\%UNIXPRODUCTNAME " . lc($value) . "\n"; push(@{$variablesref} ,$newline); $newline = "\%SYSTEMINTUNIXPACKAGENAME " . lc($value) . "\n"; |