[oe-commits] [openembedded-core] 10/21: files/toolchain-shar-extract.sh: Rework PATH cleaning

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 49c9ab03e41e1dc175e2e8db057eb5c5b9c12b4e
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Sat Mar 7 13:43:44 2020 +0000

    files/toolchain-shar-extract.sh: Rework PATH cleaning
    
    Trying to create a clean PATH breaks cases where we install a buildtools tarball
    on hosts to provide newer versions of gcc. Rework the fix for #8698 to clean up
    directories in PATH which don't exist isntead. Do it with python as the shell
    version was too fraught with corner cases.
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/files/toolchain-shar-extract.sh | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh
index 4c4b4de..2e0fe94 100644
--- a/meta/files/toolchain-shar-extract.sh
+++ b/meta/files/toolchain-shar-extract.sh
@@ -1,13 +1,8 @@
 #!/bin/sh
 
-[ -z "$ENVCLEANED" ] && exec /usr/bin/env -i ENVCLEANED=1 HOME="$HOME" \
-	LC_ALL=en_US.UTF-8 \
-	TERM=$TERM \
-	ICECC_PATH="$ICECC_PATH" \
-	http_proxy="$http_proxy" https_proxy="$https_proxy" ftp_proxy="$ftp_proxy" \
-	no_proxy="$no_proxy" all_proxy="$all_proxy" GIT_PROXY_COMMAND="$GIT_PROXY_COMMAND" "$0" "$@"
-[ -f /etc/environment ] && . /etc/environment
-export PATH=`echo "$PATH" | sed -e 's/:\.//' -e 's/::/:/'`
+export LC_ALL=en_US.UTF-8
+# Remove invalid PATH elements first (maybe from a previously setup toolchain now deleted
+PATH=`python3 -c 'import os; print(":".join(e for e in os.environ["PATH"].split(":") if os.path.exists(e)))'`
 
 tweakpath () {
     case ":${PATH}:" in

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.