[game-data-packager] 01/05: g-d-p: export ETCDIR

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository game-data-packager.

commit 4c9bbb5363cdcd6d5f987291a2dcfee8c0f50c70
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Jan 3 13:26:31 2015 +0000

    g-d-p: export ETCDIR
---
 game-data-packager | 5 +++--
 lib/via-python     | 6 ------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/game-data-packager b/game-data-packager
index 5b7e3f1..13c0d7f 100755
--- a/game-data-packager
+++ b/game-data-packager
@@ -15,13 +15,14 @@ if [ "$0" = "./game-data-packager" ]; then
 	SUPPORTED=./supported
 	LIBDIR=./lib
 	DATADIR="./out"
-	. "./etc/game-data-packager.conf"
+	ETCDIR="./etc"
 else
 	SUPPORTED=/usr/share/games/game-data-packager/supported
 	LIBDIR=/usr/lib/game-data-packager
 	DATADIR="/usr/share/games/game-data-packager"
-	. "/etc/game-data-packager.conf"
+	ETCDIR=/etc/game-data-packager
 fi
+. "$ETCDIR/game-data-packager.conf"
 . $LIBDIR/game-data-packager-shared
 LIBDIR="`unravel "$LIBDIR"`"
 DATADIR="`unravel "$DATADIR"`"
diff --git a/lib/via-python b/lib/via-python
index 96bc1b3..6604e95 100644
--- a/lib/via-python
+++ b/lib/via-python
@@ -21,12 +21,6 @@ gdp_data_driven () {
         shift
     fi
 
-    ETCDIR=/etc/game-data-packager
-
-    if [ "$0" = "./game-data-packager" ]; then
-        ETCDIR="./etc"
-    fi
-
     (
     export ETCDIR
     export SHORTNAME

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git