From 77189b5f5fe231c0cc8a0016b0cf55298329d35c Mon Sep 17 00:00:00 2001 From: Alexey Rogachevskiy Date: Mon, 17 Feb 2020 14:52:24 +0300 Subject: [PATCH] builder: Install butterfly system-wide --- builder/assets/butterfly.service | 2 +- builder/image-software.sh | 6 +----- builder/test/tests.sh | 3 --- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/builder/assets/butterfly.service b/builder/assets/butterfly.service index 7b7c890d..a822c816 100644 --- a/builder/assets/butterfly.service +++ b/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 diff --git a/builder/image-software.sh b/builder/image-software.sh index 0bf412eb..e7e3165e 100755 --- a/builder/image-software.sh +++ b/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 diff --git a/builder/test/tests.sh b/builder/test/tests.sh index b4dbb461..8c65e2fc 100755 --- a/builder/test/tests.sh +++ b/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