Further cleanup of configure.sh.

Dockerfile

@@ -1,7 +1,7 @@
 #Pull in previously built packages image with lots of libraries.
 FROM packages
 
-# Prepare directories`
+# Prepare directories
 RUN mkdir /code
 WORKDIR /code
 

configure.sh

@@ -1,25 +1,10 @@
 #!/bin/bash
-# Check OS
-#if [ ! $(command -v apt-get) ]; then
-#  echo -e "\e[1;31mERROR: Not a Debian-based linux system.
-#           Impossible to install OpenCV with this script\e[0;39m"
-#  exit 1
-#fi
 
 ## Before installing
-#echo -e "\e[1;34mUpdating the system\e[0;39m"
+echo "Updating the system"
 sudo apt-get update
-#END_CMD1=$?
-# sudo apt-get upgrade -y
-# END_CMD2=$?
-#if [ $END_CMD1 -ne 0 ]
-#then
-#	echo -e "\e[1;31mERROR: \e[39mWhen Updating the system\e[0m"
-#	exit 1
-#fi
 
-## Install Required Requisites
-#echo -e "\e[1;34mInstalling Required Requisites\e[0;39m"
+echo "Installing Required Requisites"
 sudo apt-get install -y build-essential \
                      cmake \
                      git \
@@ -29,20 +14,13 @@ sudo apt-get install -y build-essential \
                      libgeotiff-dev \
                      pkg-config -y -qq
 
-# Upgrade CMake for mvs-texturing
+echo "Upgrading CMake for MVS-Texturing"
 sudo apt-get install -y software-properties-common python-software-properties
 sudo add-apt-repository ppa:george-edison55/cmake-3.x -y
 sudo apt-get update -y
 sudo apt-get install cmake -y
 
-#if [ $? -ne 0 ]
-#then
-#    echo -e "\e[1;31mERROR: \e[39mWhen Installing Required Requisites\e[0m"
-#    exit 1
-#fi
-
-## Installing Optional Requisites
-#echo -e "\e[1;34mInstalling OpenCV Dependencies\e[0;39m"
+echo "Installing OpenCV Dependencies"
 sudo apt-get install -y libgtk2.0-dev \
                      libavcodec-dev \
                      libavformat-dev \
@@ -61,18 +39,12 @@ sudo apt-get install -y libgtk2.0-dev \
                      liblapack-dev \
                      libeigen3-dev \
                      libvtk5-dev -y -qq
-#if [ $? -ne 0 ]
-#then
-#    echo -e "\e[1;31mERROR: \e[39mError when Installing Dependencies Requisites\e[0m"
-#    exit 1
-#fi
 
-## Remove libdc1394-22-dev due to python opencv issue
-#echo -e "\e[1;34mRemoving libdc1394-22-dev\e[0;39m"
+echo "Removing libdc1394-22-dev due to python opencv issue"
 sudo apt-get remove libdc1394-22-dev
 
 ## Installing OpenSfM Requisites
-#echo -e "\e[1;34mInstalling OpenSfM Dependencies\e[0;39m"
+echo "Installing OpenSfM Dependencies"
 sudo apt-get install -y python-networkx \
                      libgoogle-glog-dev \
                      libsuitesparse-dev \
@@ -87,45 +59,22 @@ sudo pip install -U PyYAML \
                     exifread \
                     gpxpy \
                     xmltodict
-#if [ $? -ne 0 ]
-#then
-#    echo -e "\e[1;31mERROR: \e[39mError when Installing OpenSfM Dependencies\e[0m"
-#    exit 1
-#fi
 
-## Installing Ecto Requisites
-#echo -e "\e[1;34mInstalling Ecto Dependencies\e[0;39m"
+echo "Installing Ecto Dependencies"
 sudo pip install -U catkin-pkg
 sudo apt-get install -y python-empy \
                      python-nose \
                      python-pyside -y -qq
-#if [ $? -ne 0 ]
-#then
-#    echo -e "\e[1;31mERROR: \e[39mError when Installing Ecto Dependencies\e[0m"
-#    exit 1
-#fi
 
-## Installing OpenDroneMap Requisites
-#echo -e "\e[1;34mInstalling OpenDroneMap Dependencies\e[0;39m"
+echo "Installing OpenDroneMap Dependencies"
 sudo apt-get install -y python-pyexiv2 \
                      python-scipy \
                      jhead \
                      liblas-bin -y -qq
-#if [ $? -ne 0 ]
-#then
-#    echo -e "\e[1;31mERROR: \e[39mError when Installing OpenDroneMap Dependencies\e[0m"
-#    exit 1
-#fi
 
-## Get sys vars
-#NUM_CORES=`grep -c processor /proc/cpuinfo`
-
-## Add SuperBuild path to the python path
-#export PYTHONPATH=$PYTHONPATH:`pwd`/SuperBuild/install/lib/python2.7/dist-packages:`pwd`/SuperBuild/src/opensfm
-
-## Compile SuperBuild
+echo "Compiling SuperBuild"
 cd SuperBuild
 mkdir -p build && cd build
-cmake .. && make -j8 #${NUM_CORES}
+cmake .. && make -j8
 
-#echo -e "\e[1;34mScript finished\e[0;39m"
+echo "Configuration Finished"

upgradecmake.sh

@@ -1,7 +0,0 @@
-
-# Install cmake 3.2 since cmake > 3.1 is is required by mvs-texturing.
-# Installation as proposed by: 
-# http://askubuntu.com/questions/610291/how-to-install-cmake-3-2-on-ubuntu-14-04
-sudo add-apt-repository ppa:george-edison55/cmake-3.x -y
-sudo apt-get update -y
-sudo apt-get install cmake -y