Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-01 11:06:04 +08:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

ubuntu.sh: minor simplifications

Browse Source
This commit is contained in:
Beat Küng
2020-05-19 13:44:57 +02:00
parent f2e2ac5def
commit 982d2a3180
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/setup/ubuntu.sh
+3 -3
View File
@@ -55,7 +55,7 @@ fi
# check ubuntu version # check ubuntu version
# instructions for 16.04, 18.04, 20.04 # instructions for 16.04, 18.04, 20.04
# otherwise warn and point to docker? # otherwise warn and point to docker?
UBUNTU_RELEASE=`lsb_release -rs` UBUNTU_RELEASE="`lsb_release -rs`"
if [[ "${UBUNTU_RELEASE}" == "14.04" ]]; then if [[ "${UBUNTU_RELEASE}" == "14.04" ]]; then
echo "Ubuntu 14.04 unsupported, see docker px4io/px4-dev-base" echo "Ubuntu 14.04 unsupported, see docker px4io/px4-dev-base"
@@ -133,7 +133,7 @@ if [[ $INSTALL_NUTTX == "true" ]]; then
vim-common \ vim-common \
; ;
if [ ! -z "$USER" ]; then if [ -n "$USER" ]; then
# add user to dialout group (serial port access) # add user to dialout group (serial port access)
sudo usermod -a -G dialout $USER sudo usermod -a -G dialout $USER
fi fi
@@ -146,7 +146,7 @@ if [ $(which arm-none-eabi-gcc) ]; then
GCC_FOUND_VER=$(echo $GCC_VER_STR | grep -c "${NUTTX_GCC_VERSION}") GCC_FOUND_VER=$(echo $GCC_VER_STR | grep -c "${NUTTX_GCC_VERSION}")
fi fi
if [[ ! -z $GCC_FOUND_VER && $GCC_FOUND_VER -eq "1" ]]; then if [[ "$GCC_FOUND_VER" == "1" ]]; then
echo "arm-none-eabi-gcc-${NUTTX_GCC_VERSION} found, skipping installation" echo "arm-none-eabi-gcc-${NUTTX_GCC_VERSION} found, skipping installation"
else else