Resolved conflict in configure.sh

Former-commit-id: 388809c473

README.md

@@ -32,7 +32,7 @@ OpenDroneMap can run natively on Ubuntu 14.04 or later, see [Build and Run Using
 Current version: 0.2 (this software is in beta)
 
 1. Extract and enter the OpenDroneMap directory
-2. Run `bash configure.sh`
+2. Run `bash configure.sh install`
 4. Copy the default settings file and edit it: `cp default.settings.yaml settings.yaml`. Set the `project-path` value to an empty directory (you will place sub-directories containing individual projects inside). You can add many options to this file, [see here](https://github.com/OpenDroneMap/OpenDroneMap/wiki/Run-Time-Parameters)
 3. Download a sample dataset from [here](https://github.com/OpenDroneMap/odm_data_aukerman/archive/master.zip) (about 550MB) and extract it as a subdirectory in your project directory.
 4. Run `./run.sh odm_data_aukerman` 
@@ -47,7 +47,13 @@ See [here](https://github.com/OpenDroneMap/OpenDroneMap/tree/ebaaf802a1fb50e335b
 
 Extract and enter the downloaded OpenDroneMap directory and compile all of the code by executing a single configuration script:
   
-    bash configure.sh
+    bash configure.sh install
+    
+When updating to a newer version of ODM, it is recommended that you run 
+
+    bash configure.sh reinstall
+    
+to ensure all the dependent packages and modules get updated.  
 
 For Ubuntu 15.10 users, this will help you get running:
 

configure.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 
+install() {
     ## Set up library paths
-RUNPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
     export PYTHONPATH=$RUNPATH/SuperBuild/install/lib/python2.7/dist-packages:$RUNPATH/SuperBuild/src/opensfm:$PYTHONPATH
     export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$RUNPATH/SuperBuild/install/lib
 
@@ -51,9 +52,6 @@ sudo apt-get install -y -qq libgtk2.0-dev \
     echo "Removing libdc1394-22-dev due to python opencv issue"
     sudo apt-get remove libdc1394-22-dev
 
-# Installing CGAL dependencies
-sudo apt-get install libgmp-dev libmpfr-dev
-
     ## Installing OpenSfM Requisites
     echo "Installing OpenSfM Dependencies"
     sudo apt-get install -y -qq python-networkx \
@@ -73,6 +71,9 @@ sudo pip install -U PyYAML \
                         xmltodict \
                         appsettings
 
+    echo "Installing CGAL dependencies"
+    sudo apt-get install libgmp-dev libmpfr-dev
+
     echo "Installing Ecto Dependencies"
     sudo pip install -U catkin-pkg
     sudo apt-get install -y -qq python-empy \
@@ -86,13 +87,51 @@ sudo apt-get install -y -qq python-pyexiv2 \
                          liblas-bin
 
     echo "Compiling SuperBuild"
-cd SuperBuild
+    cd ${RUNPATH}/SuperBuild
     mkdir -p build && cd build
     cmake .. && make -j$(nproc)
 
     echo "Compiling build"
-cd ../..
+    cd ${RUNPATH}
     mkdir -p build && cd build
     cmake .. && make -j$(nproc)
 
     echo "Configuration Finished"
+}
+
+uninstall() {
+    echo "Removing SuperBuild and build directories"
+    cd ${RUNPATH}/SuperBuild
+    rm -rfv build src download install
+    cd ../
+    rm -rfv build
+}
+
+reinstall() {
+    echo "Reinstalling ODM modules"
+    uninstall
+    install
+}
+
+usage() {
+    echo "Usage:"
+    echo "bash configure.sh <install|update|uninstall|help>"
+    echo "Subcommands:"
+    echo "  install"
+    echo "    Installs all dependencies and modules for running OpenDroneMap"
+    echo "  reinstall"
+    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 "  help"
+    echo "    Displays this message"
+}
+
+if [[ $1 =~ ^(install|reinstall|uninstall|usage)$ ]]; then
+    RUNPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+    "$1"
+else
+    echo "Invalid instructions." >&2
+    usage
+    exit 1
+fi