aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tools: create a heading function to remove duplication

Browse Source
This commit is contained in:
Peter Barker 2020-11-25 09:18:19 +11:00 committed by Andrew Tridgell
parent 8be13ac5db
commit ab95a1f8fd
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,11 +44,15 @@ function package_is_installed() {
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"
} }
function heading() {
echo "$sep"
echo $*
echo "$sep"
}
# 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" -eq 1; then if package_is_installed "lsb-release" -eq 1; then
echo "$sep" heading "Installing lsb-release"
echo "Installing lsb-release"
echo "$sep"
$APT_GET install lsb-release $APT_GET install lsb-release
echo "Done!" echo "Done!"
fi fi
@ -114,9 +118,7 @@ function install_arm_none_eabi_toolchain() {
if [ ! -d $OPT/$ARM_ROOT ]; then if [ ! -d $OPT/$ARM_ROOT ]; then
( (
cd $OPT; cd $OPT;
echo "$sep" heading "Installing toolchain for STM32 Boards"
echo "Installing toolchain for STM32 Boards"
echo "$sep"
echo "Downloading from ArduPilot server" echo "Downloading from ArduPilot server"
sudo wget $ARM_TARBALL_URL sudo wget $ARM_TARBALL_URL
echo "Installing..." echo "Installing..."
@ -153,9 +155,7 @@ elif [ ${RELEASE_CODENAME} == "trusty" ]; then
$APT_GET update $APT_GET update
fi fi
echo "$sep" heading "Add user to dialout group to allow managing serial ports"
echo "Add user to dialout group to allow managing serial ports"
echo "$sep"
sudo usermod -a -G dialout $USER sudo usermod -a -G dialout $USER
echo "Done!" echo "Done!"
@ -207,9 +207,7 @@ if [[ -z "${DO_AP_STM_ENV}" ]] && maybe_prompt_user "Install ArduPilot STM32 too
DO_AP_STM_ENV=1 DO_AP_STM_ENV=1
fi fi
echo "$sep" heading "Removing modemmanager package that could conflict with firmware uploading"
echo "Removing modemmanager package that could conflict with firmware uploading"
echo "$sep"
if package_is_installed "modemmanager" -eq 1; then if package_is_installed "modemmanager" -eq 1; then
$APT_GET remove modemmanager $APT_GET remove modemmanager
fi fi
@ -220,9 +218,7 @@ if [[ $DO_AP_STM_ENV -eq 1 ]]; then
install_arm_none_eabi_toolchain install_arm_none_eabi_toolchain
fi fi
echo "$sep" heading "Check if we are inside docker environment..."
echo "Check if we are inside docker environment..."
echo "$sep"
IS_DOCKER=false IS_DOCKER=false
if [[ -f /.dockerenv ]] || grep -Eq '(lxc|docker)' /proc/1/cgroup ; then if [[ -f /.dockerenv ]] || grep -Eq '(lxc|docker)' /proc/1/cgroup ; then
IS_DOCKER=true IS_DOCKER=true
@ -235,9 +231,7 @@ if $IS_DOCKER; then
SHELL_LOGIN=".bashrc" SHELL_LOGIN=".bashrc"
fi fi
echo "$sep" heading "Adding ArduPilot Tools to environment"
echo "Adding ArduPilot Tools to environment"
echo "$sep"
SCRIPT_DIR=$(dirname $(realpath ${BASH_SOURCE[0]})) SCRIPT_DIR=$(dirname $(realpath ${BASH_SOURCE[0]}))
ARDUPILOT_ROOT=$(realpath "$SCRIPT_DIR/../../") ARDUPILOT_ROOT=$(realpath "$SCRIPT_DIR/../../")
@ -286,9 +280,7 @@ echo "Done!"
if [[ $SKIP_AP_GIT_CHECK -ne 1 ]]; then if [[ $SKIP_AP_GIT_CHECK -ne 1 ]]; then
if [ -d ".git" ]; then if [ -d ".git" ]; then
echo "$sep" heading "Update git submodules"
echo "Update git submodules"
echo "$sep"
cd $ARDUPILOT_ROOT cd $ARDUPILOT_ROOT
git submodule update --init --recursive git submodule update --init --recursive
echo "Done!" echo "Done!"