From 5bd1a43e31799ef1c159701b9f98b3422c46a84c Mon Sep 17 00:00:00 2001
From: Thomas NOEL <tnoel@entrouvert.com>
Date: Thu, 18 Jul 2013 18:23:55 +0200
Subject: [PATCH] update default vars definition in scripts

---
 scripts/univcloud-update-map.sh      | 10 ++++++----
 scripts/univcloud-update-metadata.sh |  6 ++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/scripts/univcloud-update-map.sh b/scripts/univcloud-update-map.sh
index 31d5179..3c90dce 100755
--- a/scripts/univcloud-update-map.sh
+++ b/scripts/univcloud-update-map.sh
@@ -1,10 +1,12 @@
 #!/bin/sh
 
+MYDIR=$(dirname $(readlink -f $0))
+
 GEOURLS="https://static.discojuice.org/feeds/renater http://isos.univnautes.entrouvert.com/univnautes.geo"
 GEODIR="/var/tmp/univcloud-geo/"
-VIRTUAL_ENV="/home/thomas/univcloud/venv/"
-PYTHONPATH="/home/thomas/univcloud/"
-LOGINHTML="/home/thomas/univcloud/univcloud/templates/univcloud/idplist.html"
+PYTHONPATH=$MYDIR/../
+VIRTUAL_ENV=${PYTHONPATH}"venv/"
+LOGINHTML=${PYTHONPATH}"univcloud/templates/univcloud/idplist.html"
 
 if [ -r /etc/univcloud.conf ]
 then
@@ -53,6 +55,6 @@ then
 fi
 
 # create indexhtml
-python univcloud-geo2idp.py $GEOFILES > $LOGINHTML
+python $MYDIR/univcloud-geo2idp.py $GEOFILES > $LOGINHTML
 
 exit 0
diff --git a/scripts/univcloud-update-metadata.sh b/scripts/univcloud-update-metadata.sh
index 3cbfbd4..3a065c0 100755
--- a/scripts/univcloud-update-metadata.sh
+++ b/scripts/univcloud-update-metadata.sh
@@ -1,11 +1,13 @@
 #!/bin/sh
 
+MYDIR=$(dirname $(readlink -f $0))
+
 MD=/var/tmp/univcloud-metadata
 MDURL="https://services-federation.renater.fr/metadata/renater-test-metadata.xml"
 MDCA=
 MDCRT=
-VIRTUAL_ENV="/home/thomas/univcloud/venv"
-MANAGE="/home/thomas/univcloud/manage.py"
+VIRTUAL_ENV=${MYDIR}/../venv/
+MANAGE=${MYDIR}/../manage.py
 
 if [ -r /etc/univcloud.conf ]
 then