From 74a35035c7dddbaa233ed120b9cb2ac708cbceae Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Sun, 20 Jun 2021 16:54:25 -0400 Subject: [PATCH] Add installreqs command in configure.sh --- VERSION | 2 +- configure.sh | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index da6b0a8f..35d16fb1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.5.6 +2.5.7 diff --git a/configure.sh b/configure.sh index b57a4402..a5727d3a 100755 --- a/configure.sh +++ b/configure.sh @@ -97,8 +97,8 @@ installruntimedepsonly() { installdepsfromsnapcraft runtime openmvs } - -install() { + +installreqs() { cd /code ## Set up library paths @@ -123,6 +123,10 @@ install() { if [ ! -z "$GPU_INSTALL" ]; then pip install --ignore-installed -r requirements.gpu.txt fi +} + +install() { + installreqs if [ ! -z "$PORTABLE_INSTALL" ]; then echo "Replacing g++ and gcc with our scripts for portability..." @@ -176,7 +180,7 @@ clean() { usage() { echo "Usage:" - echo "bash configure.sh [nproc]" + echo "bash configure.sh [nproc]" echo "Subcommands:" echo " install" echo " Installs all dependencies and modules for running OpenDroneMap" @@ -186,6 +190,8 @@ usage() { echo " Removes SuperBuild and build modules, then re-installs them. Note this does not update OpenDroneMap to the latest version. " echo " uninstall" echo " Removes SuperBuild and build modules. Does not uninstall dependencies" + echo " installreqs" + echo " Only installs the requirements (does not build SuperBuild)" echo " clean" echo " Cleans the SuperBuild directory by removing temporary files. " echo " help" @@ -193,7 +199,7 @@ usage() { echo "[nproc] is an optional argument that can set the number of processes for the make -j tag. By default it uses $(nproc)" } -if [[ $1 =~ ^(install|installruntimedepsonly|reinstall|uninstall|clean)$ ]]; then +if [[ $1 =~ ^(install|installruntimedepsonly|reinstall|uninstall|installreqs|clean)$ ]]; then RUNPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" "$1" else