From 7dc1619e4ecdcf039dede98c15c018268d17f9dd Mon Sep 17 00:00:00 2001 From: Jordan Carlin Date: Thu, 3 Oct 2024 12:03:40 -0700 Subject: [PATCH 1/2] Add check for incompatible PATH to wally-tool-chain-installation --- bin/wally-tool-chain-install.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/bin/wally-tool-chain-install.sh b/bin/wally-tool-chain-install.sh index a01298869..144d86684 100755 --- a/bin/wally-tool-chain-install.sh +++ b/bin/wally-tool-chain-install.sh @@ -104,6 +104,13 @@ fi export PATH=$PATH:$RISCV/bin:/usr/bin export PKG_CONFIG_PATH=$RISCV/lib64/pkgconfig:$RISCV/lib/pkgconfig:$RISCV/share/pkgconfig:$RISCV/lib/x86_64-linux-gnu/pkgconfig:$PKG_CONFIG_PATH +# Check for incompatible PATH environment variable before proceeding with installation +if [[ ":$PATH:" == *::* || ":$PATH:" == *:.:* ]]; then + echo -e "${FAIL_COLOR}Error: You seem to have the current working directory in your \$PATH environment variable." + echo -e "This won't work. Please update your \$PATH and try again.${ENDC}" + exit 1 +fi + # Create installation directory mkdir -p "$RISCV"/logs echo "Running as root: $ROOT" From 92b4b840fd724da5bb5c0ded0667b27991297e4b Mon Sep 17 00:00:00 2001 From: Jordan Carlin Date: Thu, 3 Oct 2024 12:15:25 -0700 Subject: [PATCH 2/2] Update installation logging filter --- bin/wally-tool-chain-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/wally-tool-chain-install.sh b/bin/wally-tool-chain-install.sh index 144d86684..58df7261b 100755 --- a/bin/wally-tool-chain-install.sh +++ b/bin/wally-tool-chain-install.sh @@ -68,7 +68,7 @@ git_check() { # Log output to a file and only print lines with keywords logger() { local log="$RISCV/logs/$1.log" - cat < /dev/stdin | tee -a "$log" | (grep -iE --color=never "(\bwarning|\berror|\bfail|\bsuccess|\bstamp)" || true) | (grep -viE --color=never "(_warning|warning_|_error|error_|-warning|warning-|-error|error-|Werror|error\.o|warning flags)" || true) + cat < /dev/stdin | tee -a "$log" | (grep -iE --color=never "(\bwarning|\berror|\bfail|\bsuccess|\bstamp|\bdoesn't work)" || true) | (grep -viE --color=never "(_warning|warning_|_error|error_|-warning|warning-|-error|error-|Werror|error\.o|warning flags)" || true) } set -e # break on error