From f3bc84a15ccd8cef387a809506519a8212078382 Mon Sep 17 00:00:00 2001 From: Jordan Carlin Date: Thu, 8 Aug 2024 22:03:45 -0700 Subject: [PATCH 1/2] filter more console output --- 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 dfda570bc..071d02599 100755 --- a/bin/wally-tool-chain-install.sh +++ b/bin/wally-tool-chain-install.sh @@ -67,7 +67,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 "(Wno-error)" || true) + 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) } set -e # break on error From 4eb2f692d7194177388c4855176e281810a82b2c Mon Sep 17 00:00:00 2001 From: Jordan Carlin Date: Thu, 8 Aug 2024 22:04:27 -0700 Subject: [PATCH 2/2] Update python venv prompt --- bin/wally-tool-chain-install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/wally-tool-chain-install.sh b/bin/wally-tool-chain-install.sh index 071d02599..962f9ed3f 100755 --- a/bin/wally-tool-chain-install.sh +++ b/bin/wally-tool-chain-install.sh @@ -67,7 +67,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)" || true) | (grep -viE --color=never "(_warning|warning_|_error|error_|-warning|warning-|-error|error-|Werror|error\.o|warning flags)" || true) } set -e # break on error @@ -135,7 +135,7 @@ section_header "Setting up Python Environment" STATUS="python virtual environment" cd "$RISCV" if [ ! -e "$RISCV"/riscv-python/bin/activate ]; then - "$PYTHON_VERSION" -m venv riscv-python + "$PYTHON_VERSION" -m venv riscv-python --prompt cvw echo -e "${OK_COLOR}Python virtual environment created!\nInstalling pip packages.${ENDC}" else echo -e "${OK_COLOR}Python virtual environment already exists.\nUpdating pip packages.${ENDC}"