free
/
freedomboneeee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Deprecate ferment. Using invites is too unreliable and there is reported high bandwidth usage

This commit is contained in:
Bob Mottram 2017-10-05 23:22:44 +01:00
parent a7f23f4a5f
commit a6a24b9655
2 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/freedombone-image-customise
View File

@ -694,7 +694,7 @@ initialise_mesh() {
#install_librevault #install_librevault
install_patchwork install_patchwork
mesh_install_scuttlebot mesh_install_scuttlebot
install_ferment #install_ferment
install_ipfs install_ipfs
install_tox install_tox
install_web_server install_web_server
@ -942,22 +942,22 @@ if [ \$no_of_users -gt 0 ]; then
fi fi
fi fi
if [ ! -f /home/$MY_USERNAME/Desktop/audio.desktop ]; then #if [ ! -f /home/$MY_USERNAME/Desktop/audio.desktop ]; then
echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/audio.desktop # echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/audio.desktop
echo 'Name=Audio/Music' >> /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 'Type=Application' >> /home/$MY_USERNAME/Desktop/audio.desktop
echo 'Comment=Audio publishing and streaming' >> /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 '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 "Icon=/etc/patchwork/icon_ferment.png" >> /home/$MY_USERNAME/Desktop/audio.desktop
echo 'Terminal=false' >> /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 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/audio.desktop
chmod +x /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 # chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/audio.desktop
else #else
if grep -q "Offline" /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|g' /home/$MY_USERNAME/Desktop/audio.desktop # sed -i 's|Name=.*|Name=Audio/Music|g' /home/$MY_USERNAME/Desktop/audio.desktop
fi # fi
fi #fi
if [ -f /tmp/.ipfs-users ]; then if [ -f /tmp/.ipfs-users ]; then
echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/sites.desktop 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 sed -i 's|Name=.*|Name=Social (Offline)|g' /home/$MY_USERNAME/Desktop/social.desktop
fi fi
fi fi
if [ -f /home/$MY_USERNAME/Desktop/audio.desktop ]; then #if [ -f /home/$MY_USERNAME/Desktop/audio.desktop ]; then
if ! grep -q "Offline" /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 # sed -i 's|Name=.*|Name=Audio/Music (Offline)|g' /home/$MY_USERNAME/Desktop/audio.desktop
fi # fi
fi #fi
pkill qtox pkill qtox
fi fi
fi fi

34
src/freedombone-image-mesh
View File

@ -302,24 +302,24 @@ function show_desktop_icons {
echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/social.desktop echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/social.desktop
echo 'Categories=Application;' >> /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 '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/audio.desktop
echo 'Name=Audio/Music (Offline)' >> /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 'Type=Application' >> /home/$MY_USERNAME/Desktop/audio.desktop
echo 'Comment=Audio publishing and streaming' >> /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 '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 "Icon=/etc/patchwork/icon_ferment.png" >> /home/$MY_USERNAME/Desktop/audio.desktop
echo 'Terminal=false' >> /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 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/audio.desktop
echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/invite.desktop #echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/invite.desktop
echo 'Version=1.0' >> /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 'Name=Create Invite' >> /home/$MY_USERNAME/Desktop/invite.desktop
echo 'Type=Application' >> /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 '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 '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 'Icon=/usr/share/freedombone/avatars/invite.png' >> /home/$MY_USERNAME/Desktop/invite.desktop
echo 'Terminal=false' >> /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 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/invite.desktop
# set permissions # set permissions
chmod +x /home/$MY_USERNAME/Desktop/*.desktop chmod +x /home/$MY_USERNAME/Desktop/*.desktop