From ea82e090fc0b3f65df4c37501237ce2e9e65f37a Mon Sep 17 00:00:00 2001 From: Daniel Axtens Date: Tue, 20 Sep 2016 16:43:24 +1000 Subject: [PATCH] parsemail.sh: make testing easier - Take PW_PYTHON, allowing the python version to be set - Only override DJANGO_SETTINGS_MODULE if it's not in the env - Pass parameters to parsemail.py Signed-off-by: Daniel Axtens Signed-off-by: Stephen Finucane --- patchwork/bin/parsemail.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/patchwork/bin/parsemail.sh b/patchwork/bin/parsemail.sh index 9973392d..829971b6 100755 --- a/patchwork/bin/parsemail.sh +++ b/patchwork/bin/parsemail.sh @@ -22,8 +22,16 @@ BIN_DIR=`dirname $0` PATCHWORK_BASE=`readlink -e $BIN_DIR/../..` +if [ -z $PW_PYTHON ]; then + PW_PYTHON=python2 +fi + +if [ -z $DJANGO_SETTINGS_MODULE ]; then + DJANGO_SETTINGS_MODULE=patchwork.settings.production +fi + PYTHONPATH="$PATCHWORK_BASE":"$PATCHWORK_BASE/lib/python:$PYTHONPATH" \ - DJANGO_SETTINGS_MODULE=patchwork.settings.production \ - "$PATCHWORK_BASE/patchwork/bin/parsemail.py" + DJANGO_SETTINGS_MODULE="$DJANGO_SETTINGS_MODULE" \ + $PW_PYTHON "$PATCHWORK_BASE/patchwork/bin/parsemail.py" $@ exit 0 -- 2.47.3