# HG changeset patch
# User Tom Gottfried <tom@intevation.de>
# Date 1494948053 -7200
# Node ID f7c49975cc1573d4b9c0b77487c3314e7d735bda
# Parent  4d73d87563abc52b51cbab2793d385817af566cb
Geo-Importer: Install dependencies directly on target system.

diff -r 4d73d87563ab -r f7c49975cc15 backend/contrib/import_river.sh
--- a/backend/contrib/import_river.sh	Tue May 16 17:07:20 2017 +0200
+++ b/backend/contrib/import_river.sh	Tue May 16 17:20:53 2017 +0200
@@ -41,19 +41,6 @@
 # Default encoding. Change here if necessary
 export LC_ALL=de_DE@euro
 
-if [ -z "$OPTIONAL_LIBS" ]; then
-    OPTIONAL_LIBS="$(dirname $0)/opt"
-fi
-
-if [ -d "$OPTIONAL_LIBS" ]; then
-    export PATH="$OPTIONAL_LIBS/bin:$PATH"
-    export LD_LIBRARY_PATH="$OPTIONAL_LIBS/lib:$LD_LIBRARY_PATH"
-    export LD_LIBRARY_PATH="$OPTIONAL_LIBS/lib64:$LD_LIBRARY_PATH"
-    export PYTHONPATH="$OPTIONAL_LIBS/lib/python2.6/site-packages:$PYTHONPATH"
-    export PYTHONPATH="$OPTIONAL_LIBS/lib64/python2.6/site-packages:$PYTHONPATH"
-    export GDAL_DATA="$OPTIONAL_LIBS/share/gdal"
-fi
-
 usage(){
     cat << EOF
 
diff -r 4d73d87563ab -r f7c49975cc15 backend/contrib/run_geo.sh
--- a/backend/contrib/run_geo.sh	Tue May 16 17:07:20 2017 +0200
+++ b/backend/contrib/run_geo.sh	Tue May 16 17:20:53 2017 +0200
@@ -38,16 +38,6 @@
 DIR=`dirname $0`
 DIR=`readlink -f "$DIR"`
 
-OPTIONAL_LIBS="${DIR}"/opt
-if [ -d "$OPTIONAL_LIBS" ]; then
-    export PATH="$OPTIONAL_LIBS/bin:$PATH"
-    export LD_LIBRARY_PATH="$OPTIONAL_LIBS/lib:$LD_LIBRARY_PATH"
-    export LD_LIBRARY_PATH="$OPTIONAL_LIBS/lib64:$LD_LIBRARY_PATH"
-    export PYTHONPATH="$OPTIONAL_LIBS/lib/python2.6/site-packages:$PYTHONPATH"
-    export PYTHONPATH="$OPTIONAL_LIBS/lib64/python2.6/site-packages:$PYTHONPATH"
-    export GDAL_DATA="$OPTIONAL_LIBS/share/gdal"
-fi
-
 exec python $DIR/shpimporter/shpimporter.py \
     --directory $RIVER_PATH \
     --river_name "$RIVER_NAME" \