From a6a24b96558ae2f8604b2e7faf3836d5ced4a46f Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 5 Oct 2017 23:22:44 +0100
Subject: [PATCH] Deprecate ferment. Using invites is too unreliable and there
is reported high bandwidth usage
---
src/freedombone-image-customise | 44 ++++++++++++++++-----------------
src/freedombone-image-mesh | 36 +++++++++++++--------------
2 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index 64f482e9c..97927b3cc 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -694,7 +694,7 @@ initialise_mesh() {
#install_librevault
install_patchwork
mesh_install_scuttlebot
- install_ferment
+ #install_ferment
install_ipfs
install_tox
install_web_server
@@ -942,22 +942,22 @@ if [ \$no_of_users -gt 0 ]; then
fi
fi
- if [ ! -f /home/$MY_USERNAME/Desktop/audio.desktop ]; then
- echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/audio.desktop
- echo 'Name=Audio/Music' >> /home/$MY_USERNAME/Desktop/audio.desktop
- echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/audio.desktop
- echo 'Comment=Audio publishing and streaming' >> /home/$MY_USERNAME/Desktop/audio.desktop
- echo 'Exec=bash /usr/bin/start_ferment' >> /home/$MY_USERNAME/Desktop/audio.desktop
- echo "Icon=/etc/patchwork/icon_ferment.png" >> /home/$MY_USERNAME/Desktop/audio.desktop
- echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/audio.desktop
- echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/audio.desktop
- chmod +x /home/$MY_USERNAME/Desktop/audio.desktop
- chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/audio.desktop
- else
- if grep -q "Offline" /home/$MY_USERNAME/Desktop/audio.desktop; then
- sed -i 's|Name=.*|Name=Audio/Music|g' /home/$MY_USERNAME/Desktop/audio.desktop
- fi
- fi
+ #if [ ! -f /home/$MY_USERNAME/Desktop/audio.desktop ]; then
+ # echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/audio.desktop
+ # echo 'Name=Audio/Music' >> /home/$MY_USERNAME/Desktop/audio.desktop
+ # echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/audio.desktop
+ # echo 'Comment=Audio publishing and streaming' >> /home/$MY_USERNAME/Desktop/audio.desktop
+ # echo 'Exec=bash /usr/bin/start_ferment' >> /home/$MY_USERNAME/Desktop/audio.desktop
+ # echo "Icon=/etc/patchwork/icon_ferment.png" >> /home/$MY_USERNAME/Desktop/audio.desktop
+ # echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/audio.desktop
+ # echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/audio.desktop
+ # chmod +x /home/$MY_USERNAME/Desktop/audio.desktop
+ # chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/audio.desktop
+ #else
+ # if grep -q "Offline" /home/$MY_USERNAME/Desktop/audio.desktop; then
+ # sed -i 's|Name=.*|Name=Audio/Music|g' /home/$MY_USERNAME/Desktop/audio.desktop
+ # fi
+ #fi
if [ -f /tmp/.ipfs-users ]; then
echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/sites.desktop
@@ -1023,11 +1023,11 @@ else
sed -i 's|Name=.*|Name=Social (Offline)|g' /home/$MY_USERNAME/Desktop/social.desktop
fi
fi
- if [ -f /home/$MY_USERNAME/Desktop/audio.desktop ]; then
- if ! grep -q "Offline" /home/$MY_USERNAME/Desktop/audio.desktop; then
- sed -i 's|Name=.*|Name=Audio/Music (Offline)|g' /home/$MY_USERNAME/Desktop/audio.desktop
- fi
- fi
+ #if [ -f /home/$MY_USERNAME/Desktop/audio.desktop ]; then
+ # if ! grep -q "Offline" /home/$MY_USERNAME/Desktop/audio.desktop; then
+ # sed -i 's|Name=.*|Name=Audio/Music (Offline)|g' /home/$MY_USERNAME/Desktop/audio.desktop
+ # fi
+ #fi
pkill qtox
fi
fi
diff --git a/src/freedombone-image-mesh b/src/freedombone-image-mesh
index 955f0037d..ad492b376 100755
--- a/src/freedombone-image-mesh
+++ b/src/freedombone-image-mesh
@@ -302,24 +302,24 @@ function show_desktop_icons {
echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/social.desktop
echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/social.desktop
- echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/audio.desktop
- echo 'Name=Audio/Music (Offline)' >> /home/$MY_USERNAME/Desktop/audio.desktop
- echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/audio.desktop
- echo 'Comment=Audio publishing and streaming' >> /home/$MY_USERNAME/Desktop/audio.desktop
- echo 'Exec=bash /usr/bin/start_ferment' >> /home/$MY_USERNAME/Desktop/audio.desktop
- echo "Icon=/etc/patchwork/icon_ferment.png" >> /home/$MY_USERNAME/Desktop/audio.desktop
- echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/audio.desktop
- echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/audio.desktop
-
- echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/invite.desktop
- echo 'Version=1.0' >> /home/$MY_USERNAME/Desktop/invite.desktop
- echo 'Name=Create Invite' >> /home/$MY_USERNAME/Desktop/invite.desktop
- echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/invite.desktop
- echo 'Comment=Create an invite for Patchwork or Ferment' >> /home/$MY_USERNAME/Desktop/invite.desktop
- echo 'Exec=mate-terminal -e freedombone-mesh-invite' >> /home/$MY_USERNAME/Desktop/invite.desktop
- echo 'Icon=/usr/share/freedombone/avatars/invite.png' >> /home/$MY_USERNAME/Desktop/invite.desktop
- echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/invite.desktop
- echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/invite.desktop
+ #echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/audio.desktop
+ #echo 'Name=Audio/Music (Offline)' >> /home/$MY_USERNAME/Desktop/audio.desktop
+ #echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/audio.desktop
+ #echo 'Comment=Audio publishing and streaming' >> /home/$MY_USERNAME/Desktop/audio.desktop
+ #echo 'Exec=bash /usr/bin/start_ferment' >> /home/$MY_USERNAME/Desktop/audio.desktop
+ #echo "Icon=/etc/patchwork/icon_ferment.png" >> /home/$MY_USERNAME/Desktop/audio.desktop
+ #echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/audio.desktop
+ #echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/audio.desktop
+
+ #echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/invite.desktop
+ #echo 'Version=1.0' >> /home/$MY_USERNAME/Desktop/invite.desktop
+ #echo 'Name=Create Invite' >> /home/$MY_USERNAME/Desktop/invite.desktop
+ #echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/invite.desktop
+ #echo 'Comment=Create an invite for Patchwork or Ferment' >> /home/$MY_USERNAME/Desktop/invite.desktop
+ #echo 'Exec=mate-terminal -e freedombone-mesh-invite' >> /home/$MY_USERNAME/Desktop/invite.desktop
+ #echo 'Icon=/usr/share/freedombone/avatars/invite.png' >> /home/$MY_USERNAME/Desktop/invite.desktop
+ #echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/invite.desktop
+ #echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/invite.desktop
# set permissions
chmod +x /home/$MY_USERNAME/Desktop/*.desktop
--
GitLab