fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-14 10:07:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

setup: clean up macOS setup script

Browse Source 
- Spaces -> tabs.
- Remove "brew install python" because it's already a dependency of the
  px4-dev tap.
- Remove "brew install ccache" as we can also add it to the px4-dev tap.
- Don't try to update pip installation, it works fine as is.
- Install pip dependencies as user, no need for system-wide install.
This commit is contained in:
Julian Oes 2020-07-15 10:53:12 +02:00 committed by Daniel Agar
parent ad14796b5f
commit aed114465e
1 changed files with 24 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
Tools/setup/OSX.sh
View File

@ -11,11 +11,11 @@ INSTALL_SIM=""
# Parse arguments
for arg in "$@"
do
if [[ $arg == "--reinstall" ]]; then
REINSTALL_FORMULAS=$arg
elif [[ $arg == "--sim-tools" ]]; then
INSTALL_SIM=$arg
fi
if [[ $arg == "--reinstall" ]]; then
REINSTALL_FORMULAS=$arg
elif [[ $arg == "--sim-tools" ]]; then
INSTALL_SIM=$arg
fi
done
# install Homebrew
@ -23,42 +23,34 @@ done
# Install px4-dev formula
if [[ $REINSTALL_FORMULAS == "--reinstall" ]]; then
echo "Re-installing PX4 general dependencies (homebrew px4-dev)"
echo "Re-installing PX4 general dependencies (homebrew px4-dev)"
# confirm Homebrew installed correctly
brew doctor
# confirm Homebrew installed correctly
brew doctor
brew tap PX4/px4
brew reinstall px4-dev ccache
# python dependencies
brew install python3
sudo -H python3 -m pip install --upgrade pip
brew tap PX4/px4
brew reinstall px4-dev
else
if brew ls --versions px4-dev > /dev/null; then
echo "px4-dev already installed"
else
echo "Installing PX4 general dependencies (homebrew px4-dev)"
brew tap PX4/px4
brew install px4-dev ccache
# python dependencies
brew install python3
sudo -H python3 -m pip install --upgrade pip
fi
if brew ls --versions px4-dev > /dev/null; then
echo "px4-dev already installed"
else
echo "Installing PX4 general dependencies (homebrew px4-dev)"
brew tap PX4/px4
brew install px4-dev
fi
fi
# Python3 dependencies
# Python dependencies
echo "Installing PX4 Python3 dependencies"
sudo -H python3 -m pip install -r ${DIR}/requirements.txt
pip3 install --user -r ${DIR}/requirements.txt
# Optional, but recommended additional simulation tools:
if [[ $INSTALL_SIM == "--sim-tools" ]]; then
if brew ls --versions px4-sim > /dev/null; then
brew install px4-sim
elif [[ $REINSTALL_FORMULAS == "--reinstall" ]]; then
brew reinstall px4-sim
fi
if brew ls --versions px4-sim > /dev/null; then
brew install px4-sim
elif [[ $REINSTALL_FORMULAS == "--reinstall" ]]; then
brew reinstall px4-sim
fi
fi
echo "All set! PX4 toolchain installed!"