Updated 1. Installation (markdown)

1.-Installation.md

@@ -1,32 +1,4 @@
-## How to install OpenDroneMap gh-pages ("main" - branch)
-
-Prerequisites: 
-- Requires Ubuntu ~~12.04~~ or 14.04.
-- Highly recommended to have at least 4GB of RAM 
-
-Install Git tools
-
-```sudo apt-get install git-core```
-
-Git Clone the repository
-
-```git clone  https://github.com/OpenDroneMap/OpenDroneMap.git```
-
-```cd OpenDroneMap;./install.sh```
-
-Check that the install script ends with script finished or something went wrong
-
-An overview of installing and running OpenDroneMap on Ubuntu can be found here:
-
-https://www.youtube.com/watch?v=e2qp3o8caPs
-
-and here:
-
-https://www.youtube.com/watch?v=7ZTufQkODLs
-
-
-
-## How to install OpenDroneMap edgarriba-cmake branch
+## How to install OpenDroneMap
 
 Prerequisites: 
 - Requires Ubuntu 14.04.
@@ -36,28 +8,38 @@ Install Git tools
 
 ```sudo apt-get install git-core```
 
-Move to your preferred installation path
-
-```cd path/to/odm/dir```
-
-Git Clone the repository and change to cmake branch
-```
-git clone https://github.com/OpenDroneMap/OpenDroneMap.git .
-git checkout edgarriba-cmake
+Git Clone the repository
 
 ```
-
-Build with cmake
-```
-export PYTHONPATH=$PYTHONPATH:`pwd`/SuperBuild/install/lib/python2.7/dist-packages:`pwd`/SuperBuild/src/opensfm
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/SuperBuild/install/lib
+git clone  https://github.com/OpenDroneMap/OpenDroneMap.git
+cd OpenDroneMap
 bash configure.sh
-```
-When configure.sh ends with "Script finished":
-```
-mkdir build && cd build && cmake .. && make
+mkdir build && cd build && cmake .. && make && cd ..
 ```
 
-Start `run.py` from root.
-If you get the error `ImportError: libecto.so.0.6` just have a look at:
-https://github.com/OpenDroneMap/OpenDroneMap/issues/251
+Check that the install script ends with script finished or something went wrong
+
+Set environment variables:
+Using your favorite editor, open `~/.bashrc` and append the following to the bottom of the file (replace [ODM-PATH] with your installation path, e.g. /home/user/OpenDroneMap):
+```
+export PYTHONPATH=$PYTHONPATH:[ODM-PATH]/SuperBuild/install/lib/python2.7/dist-packages:[ODM-PATH]/SuperBuild/src/opensfm
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:[ODM-PATH]/SuperBuild/install/lib
+```
+
+
+### Common Problems with install:
+
+If you get the error `ImportError: No module named ecto`
+- Make sure your environment variables are set correctly. 
+- You can replace `python run.py` with `./run.sh` followed by your normal parameters and that will set the environment variables for that run. 
+
+If you get `[ERROR]   You must put your pictures into an <images> directory`, your project path must look like this: 
+```
+/home/user/odm_data/
+|-- images
+    |-- IMG_0001.jpg
+    |-- IMG_0002.jpg
+    ...
+|-- gcp_list.txt
+...
+```