builder: Install butterfly system-wide

builder/assets/butterfly.service

@@ -2,5 +2,5 @@
 Description=Butterfly Terminal Server
 
 [Service]
-ExecStart=/bin/bash -c ". /root/butterfly_env/bin/activate; butterfly.server.py --host="0.0.0.0" --unsecure"
+ExecStart=/usr/local/bin/butterfly.server.py --host="0.0.0.0" --unsecure
 User=pi

builder/image-software.sh

@@ -134,14 +134,10 @@ pip3 --version
 
 echo_stamp "Install and enable Butterfly (web terminal)"
 echo_stamp "Workaround for tornado >= 6.0 breaking butterfly"
-cd /root
-python3 -m venv butterfly_env
-source butterfly_env/bin/activate
-my_travis_retry pip install tornado==5.1.1
+my_travis_retry pip install tornado==4.2.1
 my_travis_retry pip install butterfly
 my_travis_retry pip install butterfly[systemd]
 systemctl enable butterfly.socket
-deactivate
 
 echo_stamp "Install ws281x library"
 my_travis_retry pip install --prefer-binary rpi_ws281x

builder/test/tests.sh

@@ -27,10 +27,7 @@ tcpdump --version
 monkey --version
 pigpiod -v
 i2cdetect -V
-# butterfly uses its own venv, so we honor that
-. /root/butterfly_env/bin/activate
 butterfly -h
-# deactivate venv as needed
 deactivate
 espeak --version
 mjpg_streamer --version