From adc4cd2c1cbfe6db59261eb803ef4698ba6a33d4 Mon Sep 17 00:00:00 2001 From: Laurent Bachelier Date: Fri, 17 Jul 2015 16:31:27 +0200 Subject: [PATCH] Use or set the DATADIR environment variable related to e93d724ed11715d13962e46719600a0c0dc63209 --- contrib/plugin.video.videoobmc/resources/lib/base/weboobmc.py | 4 ++-- tools/local_run.py | 1 + tools/make_man.sh | 1 + tools/run_tests.sh | 1 + tools/weboob_lint.sh | 1 + 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/contrib/plugin.video.videoobmc/resources/lib/base/weboobmc.py b/contrib/plugin.video.videoobmc/resources/lib/base/weboobmc.py index 4fe95e2f..ca8c8dbe 100644 --- a/contrib/plugin.video.videoobmc/resources/lib/base/weboobmc.py +++ b/contrib/plugin.video.videoobmc/resources/lib/base/weboobmc.py @@ -49,8 +49,8 @@ class Weboobmc(): yield backend['Name'] # , self.get_backend_icon(backend['Module']) def get_backend_icon(self, module): - if 'WEBOOB_WORKDIR' in os.environ: - datadir = os.environ.get('WEBOOB_WORKDIR') + if 'WEBOOB_DATADIR' in os.environ: + datadir = os.environ.get('WEBOOB_DATADIR') else: datadir = os.path.join(os.environ.get('XDG_DATA_HOME', os.path.join(os.path.expanduser('~'), '.local', 'share') diff --git a/tools/local_run.py b/tools/local_run.py index 259197ed..6746be86 100644 --- a/tools/local_run.py +++ b/tools/local_run.py @@ -24,6 +24,7 @@ if project not in paths: env = os.environ.copy() env['PYTHONPATH'] = ':'.join(p for p in paths if p) env['WEBOOB_WORKDIR'] = wd +env['WEBOOB_DATADIR'] = wd env['WEBOOB_BACKENDS'] = os.getenv('WEBOOB_LOCAL_BACKENDS', os.getenv('WEBOOB_BACKENDS', os.path.join(os.environ.get('XDG_CONFIG_HOME', os.path.join(os.path.expanduser('~'), '.config')), 'weboob', 'backends'))) diff --git a/tools/make_man.sh b/tools/make_man.sh index fe1e2174..22ac0953 100755 --- a/tools/make_man.sh +++ b/tools/make_man.sh @@ -22,6 +22,7 @@ chmod 600 "${WEBOOB_TMPDIR}/backends" echo "file://$WEBOOB_DIR/modules" > "${WEBOOB_TMPDIR}/sources.list" export WEBOOB_WORKDIR="${WEBOOB_TMPDIR}" +export WEBOOB_DATADIR="${WEBOOB_TMPDIR}" export PYTHONPATH="${WEBOOB_DIR}" "${WEBOOB_DIR}/scripts/weboob-config" update diff --git a/tools/run_tests.sh b/tools/run_tests.sh index f55ed62f..b931bea7 100755 --- a/tools/run_tests.sh +++ b/tools/run_tests.sh @@ -70,6 +70,7 @@ ${PYTHON} "$(dirname $0)/stale_pyc.py" echo "file://${WEBOOB_MODULES}" > "${WEBOOB_TMPDIR}/sources.list" export WEBOOB_WORKDIR="${WEBOOB_TMPDIR}" +export WEBOOB_DATADIR="${WEBOOB_TMPDIR}" export PYTHONPATH="${WEBOOB_DIR}:${PYTHONPATH}" export NOSE_NOPATH="1" ${PYTHON} "${WEBOOB_DIR}/scripts/weboob-config" update diff --git a/tools/weboob_lint.sh b/tools/weboob_lint.sh index b7de8def..b2bf8d64 100755 --- a/tools/weboob_lint.sh +++ b/tools/weboob_lint.sh @@ -16,6 +16,7 @@ chmod 600 "${WEBOOB_TMPDIR}/backends" echo "file://$WEBOOB_DIR/modules" > "${WEBOOB_TMPDIR}/sources.list" export WEBOOB_WORKDIR="${WEBOOB_TMPDIR}" +export WEBOOB_DATADIR="${WEBOOB_TMPDIR}" export PYTHONPATH="${WEBOOB_DIR}" "${WEBOOB_DIR}/scripts/weboob-config" update