Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tools: install-prereqs-ubuntu: fix string concatenation 

ubuntu@ubuntu-xenial:~/ardupilot$ ./Tools/scripts/install-prereqs-ubuntu.sh
./Tools/scripts/install-prereqs-ubuntu.sh: line 19:  python-wxgtk3.0: command not found

While at each, change to use lsb_release like the other scripts.
This commit is contained in:
Lucas De Marchi 2016-04-18 21:23:36 -03:00
parent b6b593b6fb
commit 1a24a3174f
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Tools/scripts/install-prereqs-ubuntu.sh
View File

@ -13,13 +13,12 @@ SITL_PKGS="g++ python-pip python-matplotlib python-serial python-scipy python-op
UBUNTU64_PKGS="libc6:i386 libgcc1:i386 gcc-4.9-base:i386 libstdc++5:i386 libstdc++6:i386" UBUNTU64_PKGS="libc6:i386 libgcc1:i386 gcc-4.9-base:i386 libstdc++5:i386 libstdc++6:i386"
ASSUME_YES=false ASSUME_YES=false
if grep -q 'VERSION="16' /etc/os-release read -r UBUNTU_CODENAME <<<$(lsb_release -c -s)
then
# Packages for Ubuntu 16.x if [ "$UBUNTU_CODENAME" = "xenial" ]; then
SITL_PKGS+=$ " python-wxgtk3.0" SITL_PKGS+=" python-wxgtk3.0"
else else
# packages for Ubuntu <=15.x SITL_PKGS+=" python-wxgtk2.8"
SITL_PKGS+=$ " python-wxgtk2.8"
fi fi
# GNU Tools for ARM Embedded Processors # GNU Tools for ARM Embedded Processors