diff options
author | Cliff Brake <cbrake@bec-systems.com> | 2010-11-12 00:00:20 -0500 |
---|---|---|
committer | Cliff Brake <cbrake@bec-systems.com> | 2010-11-12 00:00:20 -0500 |
commit | 3c6efe8f8abc16668ca5e9cdf7a46665dac87172 (patch) | |
tree | 642c13416b99e80f0871cdc6668e832e635dfb48 /bin | |
parent | c400c874f2ac9233b8a43a73309b6e7907289c54 (diff) | |
parent | 13fbe7253c95881ede787004a4c3a1c31502e5c6 (diff) | |
download | openembedded-3c6efe8f8abc16668ca5e9cdf7a46665dac87172.tar.gz |
Merge branch 'master' into testing-nexttested_2010-11-12testing
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/sed | 6 | ||||
-rw-r--r-- | bin/wrapper.sh | 4 |
2 files changed, 4 insertions, 6 deletions
@@ -47,12 +47,10 @@ while getopts ne:f:$getopt_os opt; do save "$OPTARG" ;; i) - save "$inplace_arg" - continue + saved="$saved $inplace_arg" ;; r) - save "$extended_re_arg" - continue + saved="$saved $extended_re_arg" ;; \?) exit 1 diff --git a/bin/wrapper.sh b/bin/wrapper.sh index 3a93475b7f..d29d5b9c07 100644 --- a/bin/wrapper.sh +++ b/bin/wrapper.sh @@ -2,6 +2,8 @@ path_remove () { echo $PATH | tr ':' '\n' | grep -v "^$1\$" | tr '\n' ':' } +PATH="$(path_remove $(dirname $0))" + quote(){ sed -e "s,','\\\\'',g; 1s,^,',; \$s,\$,',;" << EOF $1 @@ -23,7 +25,5 @@ save () { exec_real () { eval set -- "$saved" - scriptdir="$(dirname $0)" - PATH="$(path_remove $scriptdir)" exec "$(basename $0)" "$@" } |