[Dive4elements-commits] [PATCH 1 of 2] Fix example run script to work with the new packaging

[Wald Commits]

# HG changeset patch
# User Andre Heinecke <aheinecke at intevation.de>
# Date 1361382613 -3600
# Branch dami
# Node ID 90b9b80ffbbfcced46f0a9b6891a1c41e8dcbddc
# Parent  e886a6ca1129605bd86777a19ba971603782398d
Fix example run script to work with the new packaging

diff -r e886a6ca1129 -r 90b9b80ffbbf flys-backend/contrib/run_geo.sh
--- a/flys-backend/contrib/run_geo.sh	Wed Feb 20 15:30:53 2013 +0100
+++ b/flys-backend/contrib/run_geo.sh	Wed Feb 20 18:50:13 2013 +0100
@@ -32,12 +32,14 @@
 DIR=`dirname $0`
 DIR=`readlink -f "$DIR"`
 
-OPTIONAL_LIBS="${DIR}"/../opt
+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 \
@@ -56,7 +58,6 @@
     --skip_floodplains $SKIP_FLOODPLAINS \
     --skip_hydr_boundaries $SKIP_HYDR_BOUNDARIES \
     --skip_gauge_locations $SKIP_GAUGE_LOCATION \
-    --skip_catchments $SKIP_CATCHMENTS \
     --skip_uesgs $SKIP_UESG \
     --skip_hws_lines $SKIP_HWS_LINES \
     --skip_hws_points $SKIP_HWS_POINTS \