From ac5e1ff89c27bd88a6eceb923ef8a9b1363eefb3 Mon Sep 17 00:00:00 2001 From: Risto Date: Tue, 10 Aug 2021 11:44:10 +0200 Subject: [PATCH] .bashrc needs to be sourced by user manually --- tools/setup_buildenv_ubuntu20.04.sh | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/tools/setup_buildenv_ubuntu20.04.sh b/tools/setup_buildenv_ubuntu20.04.sh index 3c9ddf7cd..6dede1e5e 100644 --- a/tools/setup_buildenv_ubuntu20.04.sh +++ b/tools/setup_buildenv_ubuntu20.04.sh @@ -27,11 +27,9 @@ echo "=== Step 1: Checking if i386 requirement is satisfied ===" OUTPUT=$(dpkg --print-foreign-architectures 2> /dev/null | grep i386) if [ $? -eq 1 ]; then echo "Need to install i386 architecture first." - I386ARCH="no" sudo dpkg --add-architecture i386 else - echo "Match was found, i386 requirement satisfied!" - I386ARCH="yes" + echo "i386 requirement satisfied!" fi if [[ $PAUSEAFTEREACHLINE == "true" ]]; then echo "Step finished. Please check the output above and press Enter to continue or Ctrl+C to stop." @@ -141,12 +139,5 @@ if [[ $PAUSEAFTEREACHLINE == "true" ]]; then echo "Step finished." fi -if [[ $I386ARCH == "no" ]]; then -## Likely running in WSL2 - echo "Reloading .bashrc". - source ~/.bashrc - echo "Finished setting up EdgeTX development environment." -else -## Likely running on bare-metal or virtual machine - echo "Finished setting up EdgeTX development environment. Please reboot the computer." -fi +echo "Finished setting up EdgeTX development environment." +echo "Please execute: source ~/.bashrc"