Browse Source

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

Bob Mottram 7 years ago
parent
commit
a6a24b9655
2 changed files with 40 additions and 40 deletions
  1. 22
    22
      src/freedombone-image-customise
  2. 18
    18
      src/freedombone-image-mesh

+ 22
- 22
src/freedombone-image-customise View File

@@ -694,7 +694,7 @@ initialise_mesh() {
694 694
     #install_librevault
695 695
     install_patchwork
696 696
     mesh_install_scuttlebot
697
-    install_ferment
697
+    #install_ferment
698 698
     install_ipfs
699 699
     install_tox
700 700
     install_web_server
@@ -942,22 +942,22 @@ if [ \$no_of_users -gt 0 ]; then
942 942
         fi
943 943
     fi
944 944
 
945
-    if [ ! -f /home/$MY_USERNAME/Desktop/audio.desktop ]; then
946
-        echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/audio.desktop
947
-        echo 'Name=Audio/Music' >> /home/$MY_USERNAME/Desktop/audio.desktop
948
-        echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/audio.desktop
949
-        echo 'Comment=Audio publishing and streaming' >> /home/$MY_USERNAME/Desktop/audio.desktop
950
-        echo 'Exec=bash /usr/bin/start_ferment' >> /home/$MY_USERNAME/Desktop/audio.desktop
951
-        echo "Icon=/etc/patchwork/icon_ferment.png" >> /home/$MY_USERNAME/Desktop/audio.desktop
952
-        echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/audio.desktop
953
-        echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/audio.desktop
954
-        chmod +x /home/$MY_USERNAME/Desktop/audio.desktop
955
-        chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/audio.desktop
956
-    else
957
-        if grep -q "Offline" /home/$MY_USERNAME/Desktop/audio.desktop; then
958
-            sed -i 's|Name=.*|Name=Audio/Music|g' /home/$MY_USERNAME/Desktop/audio.desktop
959
-        fi
960
-    fi
945
+    #if [ ! -f /home/$MY_USERNAME/Desktop/audio.desktop ]; then
946
+    #    echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/audio.desktop
947
+    #    echo 'Name=Audio/Music' >> /home/$MY_USERNAME/Desktop/audio.desktop
948
+    #    echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/audio.desktop
949
+    #    echo 'Comment=Audio publishing and streaming' >> /home/$MY_USERNAME/Desktop/audio.desktop
950
+    #    echo 'Exec=bash /usr/bin/start_ferment' >> /home/$MY_USERNAME/Desktop/audio.desktop
951
+    #    echo "Icon=/etc/patchwork/icon_ferment.png" >> /home/$MY_USERNAME/Desktop/audio.desktop
952
+    #    echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/audio.desktop
953
+    #    echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/audio.desktop
954
+    #    chmod +x /home/$MY_USERNAME/Desktop/audio.desktop
955
+    #    chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/audio.desktop
956
+    #else
957
+    #    if grep -q "Offline" /home/$MY_USERNAME/Desktop/audio.desktop; then
958
+    #        sed -i 's|Name=.*|Name=Audio/Music|g' /home/$MY_USERNAME/Desktop/audio.desktop
959
+    #    fi
960
+    #fi
961 961
 
962 962
     if [ -f /tmp/.ipfs-users ]; then
963 963
         echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/sites.desktop
@@ -1023,11 +1023,11 @@ else
1023 1023
                 sed -i 's|Name=.*|Name=Social (Offline)|g' /home/$MY_USERNAME/Desktop/social.desktop
1024 1024
             fi
1025 1025
         fi
1026
-        if [ -f /home/$MY_USERNAME/Desktop/audio.desktop ]; then
1027
-            if ! grep -q "Offline" /home/$MY_USERNAME/Desktop/audio.desktop; then
1028
-                sed -i 's|Name=.*|Name=Audio/Music (Offline)|g' /home/$MY_USERNAME/Desktop/audio.desktop
1029
-            fi
1030
-        fi
1026
+        #if [ -f /home/$MY_USERNAME/Desktop/audio.desktop ]; then
1027
+        #    if ! grep -q "Offline" /home/$MY_USERNAME/Desktop/audio.desktop; then
1028
+        #        sed -i 's|Name=.*|Name=Audio/Music (Offline)|g' /home/$MY_USERNAME/Desktop/audio.desktop
1029
+        #    fi
1030
+        #fi
1031 1031
         pkill qtox
1032 1032
     fi
1033 1033
 fi

+ 18
- 18
src/freedombone-image-mesh View File

@@ -302,24 +302,24 @@ function show_desktop_icons {
302 302
     echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/social.desktop
303 303
     echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/social.desktop
304 304
 
305
-    echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/audio.desktop
306
-    echo 'Name=Audio/Music (Offline)' >> /home/$MY_USERNAME/Desktop/audio.desktop
307
-    echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/audio.desktop
308
-    echo 'Comment=Audio publishing and streaming' >> /home/$MY_USERNAME/Desktop/audio.desktop
309
-    echo 'Exec=bash /usr/bin/start_ferment' >> /home/$MY_USERNAME/Desktop/audio.desktop
310
-    echo "Icon=/etc/patchwork/icon_ferment.png" >> /home/$MY_USERNAME/Desktop/audio.desktop
311
-    echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/audio.desktop
312
-    echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/audio.desktop
313
-
314
-    echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/invite.desktop
315
-    echo 'Version=1.0' >> /home/$MY_USERNAME/Desktop/invite.desktop
316
-    echo 'Name=Create Invite' >> /home/$MY_USERNAME/Desktop/invite.desktop
317
-    echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/invite.desktop
318
-    echo 'Comment=Create an invite for Patchwork or Ferment' >> /home/$MY_USERNAME/Desktop/invite.desktop
319
-    echo 'Exec=mate-terminal -e freedombone-mesh-invite' >> /home/$MY_USERNAME/Desktop/invite.desktop
320
-    echo 'Icon=/usr/share/freedombone/avatars/invite.png' >> /home/$MY_USERNAME/Desktop/invite.desktop
321
-    echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/invite.desktop
322
-    echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/invite.desktop
305
+    #echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/audio.desktop
306
+    #echo 'Name=Audio/Music (Offline)' >> /home/$MY_USERNAME/Desktop/audio.desktop
307
+    #echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/audio.desktop
308
+    #echo 'Comment=Audio publishing and streaming' >> /home/$MY_USERNAME/Desktop/audio.desktop
309
+    #echo 'Exec=bash /usr/bin/start_ferment' >> /home/$MY_USERNAME/Desktop/audio.desktop
310
+    #echo "Icon=/etc/patchwork/icon_ferment.png" >> /home/$MY_USERNAME/Desktop/audio.desktop
311
+    #echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/audio.desktop
312
+    #echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/audio.desktop
313
+
314
+    #echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/invite.desktop
315
+    #echo 'Version=1.0' >> /home/$MY_USERNAME/Desktop/invite.desktop
316
+    #echo 'Name=Create Invite' >> /home/$MY_USERNAME/Desktop/invite.desktop
317
+    #echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/invite.desktop
318
+    #echo 'Comment=Create an invite for Patchwork or Ferment' >> /home/$MY_USERNAME/Desktop/invite.desktop
319
+    #echo 'Exec=mate-terminal -e freedombone-mesh-invite' >> /home/$MY_USERNAME/Desktop/invite.desktop
320
+    #echo 'Icon=/usr/share/freedombone/avatars/invite.png' >> /home/$MY_USERNAME/Desktop/invite.desktop
321
+    #echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/invite.desktop
322
+    #echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/invite.desktop
323 323
 
324 324
     # set permissions
325 325
     chmod +x /home/$MY_USERNAME/Desktop/*.desktop