Merge branch 'Holzhaus-pure-python'

Conflicts:
	boot/boot.py
	boot/boot.sh
	client/main.py
	client/start.sh

1 files changed, 26 insertions, 1 deletions

diff --git a/boot/boot.py b/boot/boot.py
index cb49552..5291ea2 100755
--- a/boot/boot.py
+++ b/boot/boot.py
@@ -1,9 +1,34 @@
 #!/usr/bin/env python2
 # -*- coding: utf-8-*-
+
 import os
-import urllib2
 import sys
 
+# Set $JASPER_HOME
+jasper_home = os.getenv("JASPER_HOME")
+if not jasper_home or not os.path.exists(jasper_home):
+    if os.path.exists("/home/pi"):
+        jasper_home = "/home/pi"
+        os.environ["JASPER_HOME"] = jasper_home
+    else:
+        print("Error: $JASPER_HOME is not set.")
+        sys.exit(0)
+
+# Change CWD to $JASPER_HOME/jasper/boot
+os.chdir(os.path.join(os.getenv("JASPER_HOME"), "jasper", "boot"))
+
+# Set $LD_LIBRARY_PATH
+os.environ["LD_LIBRARY_PATH"] = "/usr/local/lib"
+
+# Set $PATH
+path = os.getenv("PATH")
+if path:
+    path = os.pathsep.join([path, "/usr/local/lib/"])
+else:
+    path = "/usr/local/lib/"
+os.environ["PATH"] = path
+
+import urllib2
 import vocabcompiler
 import traceback