Skip to content

Commit

Permalink
Attempt 4 to fix build, temporarily move Butterfly install to ros_ins…
Browse files Browse the repository at this point in the history
…tall
  • Loading branch information
okalachev committed Sep 19, 2018
1 parent a2a34a4 commit f532372
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 9 deletions.
10 changes: 10 additions & 0 deletions image_builder/scripts/ros_install.sh
Expand Up @@ -165,4 +165,14 @@ apt-get clean
# Remove local mirror repository key
#apt-key del COEX-MIRROR

echo -e "\033[0;31m\033[1m$(date) | #14 Install Butterfly\033[0m\033[0m"
# install and enable Butterfly (web terminal)
# TODO: move it back to software_install
# Had to move it here, as we don't have `clever` directory in software_install
pip3 install butterfly
pip3 install butterfly[systemd]
ln -s /home/pi/catkin_ws/src/clever/deploy/butterfly.service /lib/systemd/system/
ln -s /home/pi/catkin_ws/src/clever/deploy/butterfly.socket /lib/systemd/system/
systemctl enable butterfly.socket

echo -e "\033[0;31m\033[1m$(date) | END of ROS INSTALLATION\033[0m\033[0m"
11 changes: 2 additions & 9 deletions image_builder/scripts/software_install.sh
Expand Up @@ -28,7 +28,8 @@ apt-get install --no-install-recommends -y \
libjpeg8-dev=8d1-2 \
tcpdump \
ltrace \
libpoco-dev=1.7.6+dfsg1-5+deb9u1
libpoco-dev=1.7.6+dfsg1-5+deb9u1 \
libffi-dev # for butterfly

# Deny byobu to check available updates
sed -i "s/updates_available//" /usr/share/byobu/status/status
Expand All @@ -46,14 +47,6 @@ rm build/conf/sites/default
ln -s /home/pi/catkin_ws/src/clever/deploy/monkey ./build/conf/sites/default
cd /home/pi

# install and enable Butterfly (web terminal)
apt-get install libffi-dev
pip3 install butterfly
pip3 install butterfly[systemd]
ln -s /home/pi/catkin_ws/src/clever/deploy/butterfly.service /lib/systemd/system/
ln -s /home/pi/catkin_ws/src/clever/deploy/butterfly.socket /lib/systemd/system/
systemctl enable butterfly.socket

echo -e "\033[0;31m\033[1m$(date) | #2 Adding mjpg-streamer at /home/pi\033[0m\033[0m"
# https://github.com/jacksonliam/mjpg-streamer

Expand Down

0 comments on commit f532372

Please sign in to comment.