Finalysed branch, ready to merge.

README.md

@@ -8,7 +8,7 @@ Status
 [Coverage report](http://gts2.gitext.gfz-potsdam.de/gts2_client/coverage/)
 
 ## Release notes
-* **2018-01-19:** Added installation information and conda installation file for all needed packages
+* **2018-02-16:** Added installation information and installation script for miniconda and all needed packages
 * **2018-01-18:** Added docker file and script for building an compatible image and running a container for the client
 * **2018-01-17:** Added option for mosaicing/merging tifs and RGBs on client side
 * **2018-01-10:** Added output of RGB images into jpg or png, nc-output still in progress
@@ -49,12 +49,9 @@ Everything is based on bash shell.
 #### EITHER: Use install script and follow instructions:
 Run: `bash install_py_gts2_client.sh`
 
-
 After providing the installation path the script will install miniconda
 and all necessary packages as well as the gts2_client.
-Everything is installed into a conda environment called *gts2_client*.
-At the script will provide instructions how to start the environment
-and which PATHs to add to your .bashrc.
+At the script will provide instructions which PATHs to add to your .bashrc.
 
 #### OR: Per hand (expert modus):
 * Download and install at least Miniconda with default settings:

gts2_client_conda_install.yml

-name: gts2_client
+name: root
 channels:
   - conda-forge
 dependencies:

install_py_gts2_client.sh

 #!/usr/bin/env bash
 
 echo "###################################"
-echo "This is the installation routine for installing anaconda and necessary packages for gts2_client."
-echo "Depending on teh load of your machine, this process can take up to an hour, so lean back and relax!"
-echo "All Files are stored into your installation path which you provide now."
+echo "This is the installation routine for installing Miniconda and all necessary packages for gts2_client."
+echo "Depending on the load of your machine, this process can take up to an hour, so lean back and relax!"
+echo "All files are stored into your installation path which you will provide in the following."
 echo "Please make sure that you have sufficient free space in ths installation path (at least 3 GB)."
 echo "###################################"
 current_path=$(pwd)
@@ -26,27 +26,25 @@ env_name=gts2_client
 echo "Creating a conda environment named: ${env_name} ..."
 export PATH=${inst_path}/${conda_vers}/bin/:$PATH
 export PYTHONPATH=${inst_path}/${conda_vers}/lib/python3.6/site-packages/
-conda create -y -n ${env_name} python=3
 echo "... Ready"
 
 echo "Installing necessary packages ..."
-conda env update -n ${env_name} -f ${current_path}/gts2_client_conda_install.yml
+conda env update -f ${current_path}/gts2_client_conda_install.yml
 echo "... Ready"
 
 echo "Installing gts2_client ..."
 cd ${current_path}
-source activate ${env_name}
 python setup.py install
 echo "... Ready"
 
 echo "###############################"
-echo "Congratulations! Anaconda and all necessary packages are installed"
+echo "Congratulations! Miniconda and all necessary packages are installed"
 echo " "
 echo "###############################"
 echo "In order to load your environment and run gts2_client, run the following commands in your bash shell:"
 echo "###############################"
 echo "### 1. ###"
-echo "Set the path env-variables right (you can also add the following lines to your $HOME/.bashrc  :"
+echo "Set the paths right (you can also add the following lines to your $HOME/.bashrc [recommended]) :"
 echo "--------"
 echo "export PATH=${inst_path}/${conda_vers}/bin/:$PATH"
 echo "export PYTHONPATH=${inst_path}/${conda_vers}/lib/python3.6/site-packages/:$PYTHONPATH"