[Libreoffice-commits] .: 2 commits - bin/distro-install-clean-up bin/distro-install-desktop-integration bin/distro-install-file-lists bin/distro-install-sdk config_host.mk.source sysui/desktop

[Petr Mladek]

 bin/distro-install-clean-up            |    2 +-
 bin/distro-install-desktop-integration |    2 +-
 bin/distro-install-file-lists          |    2 +-
 bin/distro-install-sdk                 |    2 +-
 config_host.mk.source                  |   10 ++++++++++
 sysui/desktop/productversion.mk        |    4 +++-
 6 files changed, 17 insertions(+), 5 deletions(-)

New commits:
commit 277b7fd3a483351368604ef2b71fb5ff44801e8b
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Jun 11 18:20:23 2012 +0200

    new script config_host.mk.source
    
    it allows to source variables from config_host.mk into shell;
    there are many different hacks for this on other locations
    
    Use this script in bin/distro-install-*; The original solution
    with 'eval' did not work because shell was not able to pass
    that many arguments
    
    Change-Id: I3d9eb2fe2d6804a3c7783487e9c70f093edb2ad5

diff --git a/bin/distro-install-clean-up b/bin/distro-install-clean-up
index 54dd1f3..170ceb9 100755
--- a/bin/distro-install-clean-up
+++ b/bin/distro-install-clean-up
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if test -z "${SRC_ROOT}"; then
-    eval $(sed -e s/\'/\'\\\\\'\'/g -e 's/=\(.\+\)/='\''\1'\'/ ./config_host.mk)
+    source ./config_host.mk.source
 fi
 if test -z "${SOLARENV}"; then
     echo "distro-install-clean-up: No environment set!"
diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration
index c7f58ee..3727f83 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if test -z "${SRC_ROOT}"; then
-    eval $(sed -e s/\'/\'\\\\\'\'/g -e 's/=\(.\+\)/='\''\1'\'/ ./config_host.mk)
+    source ./config_host.mk.source
 fi
 if test -z "${SOLARENV}"; then
     echo "distro-install-clean-up: No environment set!"
diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
index de3b859..98b3d80 100755
--- a/bin/distro-install-file-lists
+++ b/bin/distro-install-file-lists
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if test -z "${SRC_ROOT}"; then
-    eval $(sed -e s/\'/\'\\\\\'\'/g -e 's/=\(.\+\)/='\''\1'\'/ ./config_host.mk)
+    source ./config_host.mk.source
 fi
 if test -z "${SOLARENV}"; then
     echo "distro-install-clean-up: No environment set!"
diff --git a/bin/distro-install-sdk b/bin/distro-install-sdk
index f1cb6fe..7184f35 100755
--- a/bin/distro-install-sdk
+++ b/bin/distro-install-sdk
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if test -z "${SRC_ROOT}"; then
-    eval $(sed -e s/\'/\'\\\\\'\'/g -e 's/=\(.\+\)/='\''\1'\'/ ./config_host.mk)
+    source ./config_host.mk.source
 fi
 if test -z "${SOLARENV}"; then
     echo "distro-install-clean-up: No environment set!"
diff --git a/config_host.mk.source b/config_host.mk.source
new file mode 100644
index 0000000..042ffa2
--- /dev/null
+++ b/config_host.mk.source
@@ -0,0 +1,10 @@
+# this script allows to correctly source config_host.mk into existing shell
+#
+# Usage:
+#
+#       source ./config_host.mk.source
+
+temp_conf=`mktemp config_host.mk.XXXXXX`
+sed -e 's/^\s*\(export [A-Z0-9_]*=\)\(.*\)$/\1"\2"/' config_host.mk >$temp_conf
+source $temp_conf
+rm $temp_conf
commit 525bd17ff257863226119e310fa69791aeb59d8a
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Jun 11 18:16:08 2012 +0200

    correctly set icon names in desktop files
    
    config_host.mk defines even empty UNIXWRAPPERNAME variable now.
    Hence, 'UNIXWRAPPERNAME *=' newer assign the default value.
    
    Change-Id: I2c782bdf79eddffa2451c5462106519479db7431

diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk
index 5a186bc..51dbfdb 100755
--- a/sysui/desktop/productversion.mk
+++ b/sysui/desktop/productversion.mk
@@ -57,7 +57,9 @@ ICONVERSION = $(PRODUCTVERSIONSHORT:s/.//g)
 # the default values get replaced by make_installer.pl at (core0x) packaging time;
 # another wrapper name can be forced by --with-unix-wrapper configure option
 # which is need by other distributors, see http://www.openoffice.org/issues/show_bug.cgi?id=75366
-UNIXWRAPPERNAME *= '$${{UNIXPRODUCTNAME}}$${{BRANDPACKAGEVERSION}}'
+.IF "$(UNIXWRAPPERNAME)" == ""
+UNIXWRAPPERNAME = '$${{UNIXPRODUCTNAME}}$${{BRANDPACKAGEVERSION}}'
+.ENDIF
 
 PRODUCTNAME.libreoffice = LibreOffice
 PRODUCTVERSION.libreoffice = $(PRODUCTVERSION)