Merge branch 'ubuntuBuildEnv' of https://github.com/EdgeTX/edgetx into ubuntuBuildEnv
This commit is contained in:
@@ -26,11 +26,9 @@ echo "=== Step 1: Checking if i386 requirement is satisfied ==="
|
|||||||
OUTPUT=x$(dpkg --print-foreign-architectures 2> /dev/null | grep i386) || :
|
OUTPUT=x$(dpkg --print-foreign-architectures 2> /dev/null | grep i386) || :
|
||||||
if [ "$OUTPUT" != "xi386" ]; then
|
if [ "$OUTPUT" != "xi386" ]; then
|
||||||
echo "Need to install i386 architecture first."
|
echo "Need to install i386 architecture first."
|
||||||
I386ARCH="no"
|
|
||||||
sudo dpkg --add-architecture i386
|
sudo dpkg --add-architecture i386
|
||||||
else
|
else
|
||||||
echo "Match was found, i386 requirement satisfied!"
|
echo "i386 requirement satisfied!"
|
||||||
I386ARCH="yes"
|
|
||||||
fi
|
fi
|
||||||
if [[ $PAUSEAFTEREACHLINE == "true" ]]; then
|
if [[ $PAUSEAFTEREACHLINE == "true" ]]; then
|
||||||
echo "Step finished. Please check the output above and press Enter to continue or Ctrl+C to stop."
|
echo "Step finished. Please check the output above and press Enter to continue or Ctrl+C to stop."
|
||||||
@@ -140,12 +138,5 @@ if [[ $PAUSEAFTEREACHLINE == "true" ]]; then
|
|||||||
echo "Step finished."
|
echo "Step finished."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ $I386ARCH == "no" ]]; then
|
echo "Finished setting up EdgeTX development environment."
|
||||||
## Likely running in WSL2
|
echo "Please execute: source ~/.bashrc"
|
||||||
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
|
|
||||||
|
|||||||
Reference in New Issue
Block a user