Teach CraftUI about standalone tornado.
It's installed from vendor/opensource/tornado into the system image, so
we only need to special case running on a dev machine now.
Change-Id: I09446df40461defd94d17dd1981a2fdc8bc56d32
diff --git a/craftui/craftui b/craftui/craftui
index 9d2a17a..2250595 100755
--- a/craftui/craftui
+++ b/craftui/craftui
@@ -3,6 +3,8 @@
pycode=/bin/craftui.py
cw=/usr/catawampus
devcw=../../../../vendor/google/catawampus
+tornado=
+devtornado=../../../../vendor/opensource/tornado
localwww=./www
# in developer environment if vendor/google/catawapus is above us
@@ -18,6 +20,7 @@
# if running from developer desktop, use simulated data
if [ -n "$sim" ]; then
cw="$devcw"
+ tornado="$devtornado"
args="$args --http-port=$((8888+2*($sim-1)))"
args="$args --https-port=$((8889+2*($sim-1)))"
args="$args --sim=./sim$sim"
@@ -43,5 +46,5 @@
exit 1
done
-export PYTHONPATH="$cw/tr/vendor/tornado:$cw/tr/vendor/curtain:$PYTHONPATH"
+export PYTHONPATH="$tornado:$cw/tr/vendor/curtain:$PYTHONPATH"
exec python -u $debug $pycode $args $httpsmode