Merge branch 'improve_setup_lxplus' into 'master'

Improve etc/setup_lxplus.sh

See merge request !249

doc/usermanual/chapters/installation.tex

@@ -80,6 +80,9 @@ $ git clone https://gitlab.cern.ch/corryvreckan/corryvreckan.git
 $ cd corryvreckan
 \end{verbatim}
 
+For an installation on \command{lxplus}, the environment variables need to be set by running \dir{source etc/setup_lxplus.sh} before proceeding with the installation as described below.
+The same script needs to be sourced any time after logging back into \command{lxplus} in order for the \command{corry} executable to be added to the \parameter{PATH} variable.
+
 \subsection{Configuration via CMake}
 \label{sec:cmake_config}
 \corry uses the CMake build system to configure, build, and install the core framework as well as all modules.

etc/setup_lxplus.sh

@@ -9,6 +9,14 @@ ABSOLUTE_PATH=`dirname $(readlink -f ${BASH_SOURCE[0]})`
 # Load default configuration
 source $ABSOLUTE_PATH/../.gitlab-ci.d/init_x86_64.sh
 
-# Add <path-to-corryvreckan> to PATH
-CORRY_PATH=$( cd "$ABSOLUTE_PATH/../bin" ; pwd -P )
-export PATH=$CORRY_PATH:$PATH
+# Check if corry executable exists
+if [ -f "$ABSOLUTE_PATH/../bin/corry" ]; then
+    # Add <path-to-corryvreckan> to PATH
+    CORRY_PATH=$( cd "$ABSOLUTE_PATH/../bin" ; pwd -P )
+    export PATH=$CORRY_PATH:$PATH
+else
+    echo "Could not find corry exectuable. Please complete the installation by executing:"
+    echo "$ mkdir build && cd build"
+    echo "$ cmake .."
+    echo "$ make install -j <number_of_cores>"
+fi