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 package_is_installed

This commit is contained in:
Pierre Kancir 2020-06-03 18:53:35 +02:00 committed by Peter Barker
parent d08e9b3363
commit e40480a0ed
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Tools/environment_install/install-prereqs-ubuntu.sh
View File

@ -41,11 +41,11 @@ fi
$APT_GET update $APT_GET update
function package_is_installed() { function package_is_installed() {
return $(dpkg-query -W -f='${Status}' "$1" 2>/dev/null | grep -c "ok installed") dpkg-query -W -f='${Status}' "$1" 2>/dev/null | grep -c "ok installed"
} }
# Install lsb-release as it is needed to check Ubuntu version # Install lsb-release as it is needed to check Ubuntu version
if package_is_installed "lsb-release" -ne 1; then if package_is_installed "lsb-release" -eq 1; then
echo "$sep" echo "$sep"
echo "Installing lsb-release" echo "Installing lsb-release"
echo "$sep" echo "$sep"
@ -154,7 +154,7 @@ echo "Done!"
echo "$sep" echo "$sep"
echo "Removing modemmanager package that could conflict with firmware uploading" echo "Removing modemmanager package that could conflict with firmware uploading"
echo "$sep" echo "$sep"
if package_is_installed "modemmanager" -ne 1; then if package_is_installed "modemmanager" -eq 1; then
$APT_GET remove modemmanager $APT_GET remove modemmanager
fi fi
echo "Done!" echo "Done!"