Add wrapper scripts to avoid PYTHONPATH madness!

bin/oonib

@@ -0,0 +1,4 @@
+#!/bin/sh
+ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
+export PYTHONPATH=$PYTHONPATH:$ROOT
+twistd -ny $ROOT/oonib/oonibackend.py

bin/ooniprobe

@@ -0,0 +1,4 @@
+#!/bin/sh
+ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
+export PYTHONPATH=$PYTHONPATH:$ROOT
+python $ROOT/ooni/ooniprobe.py

oonib/lib/__init__.py

@@ -1,6 +1,8 @@
 from ooni.utils import Storage
 from ooni.utils.config import Config
+import os
 
+root = os.path.normpath(os.path.join(os.path.realpath(__file__), '../../'))
 config = Storage()
-config.main = Config('main', 'oonibackend.conf')
-config.daphn3 = Config('daphn3', 'oonibackend.conf')
+config.main = Config('main', os.path.join(root, 'oonibackend.conf'))
+config.daphn3 = Config('daphn3', os.path.join(root, 'oonibackend.conf'))