diff options
| -rwxr-xr-x | bin/distro-install-clean-up | 2 | ||||
| -rwxr-xr-x | bin/distro-install-desktop-integration | 2 | ||||
| -rwxr-xr-x | bin/distro-install-file-lists | 2 | ||||
| -rwxr-xr-x | bin/distro-install-sdk | 2 | ||||
| -rw-r--r-- | config_host.mk.source | 10 |
5 files changed, 14 insertions, 4 deletions
diff --git a/bin/distro-install-clean-up b/bin/distro-install-clean-up index 54dd1f3822ca..170ceb910beb 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 c7f58ee3ccd5..3727f83462d7 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 de3b859a39b3..98b3d80fd14e 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 f1cb6fe39e11..7184f35a32c7 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 000000000000..042ffa2589be --- /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 |