summaryrefslogtreecommitdiff
path: root/bin/distro-install-desktop-integration
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.cz>2012-02-29 20:26:13 +0100
committerPetr Mladek <pmladek@suse.cz>2012-02-29 20:29:34 +0100
commita0238fda86e18f8a282f9307bd6b201f97f5f331 (patch)
tree3636e5a9b5ffa788f983b70500b79b116090de96 /bin/distro-install-desktop-integration
parentb9b8ae8a484471ce067ad09dc96cad0d87285a6f (diff)
bin/distro-install*: source config_host.mk instead of Env.Host.sh
thanks Stefan Bergman for improving the sed pattern
Diffstat (limited to 'bin/distro-install-desktop-integration')
-rwxr-xr-xbin/distro-install-desktop-integration8
1 files changed, 7 insertions, 1 deletions
diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration
index 6e4528595d6e..c7f58ee3ccd5 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -1,6 +1,12 @@
#!/bin/sh
-. ./*[Ee]nv.[Hh]ost.sh
+if test -z "${SRC_ROOT}"; then
+ eval $(sed -e s/\'/\'\\\\\'\'/g -e 's/=\(.\+\)/='\''\1'\'/ ./config_host.mk)
+fi
+if test -z "${SOLARENV}"; then
+ echo "distro-install-clean-up: No environment set!"
+ exit 1
+fi
PRODUCTVERSION_NODOT=`echo $PRODUCTVERSION | sed -e "s/\.//"`