Browse Source

Replace web based mesh users list with a text file

This should load more quickly
Bob Mottram 9 years ago
parent
commit
8200a26528
No account linked to committer's email
3 changed files with 17 additions and 12 deletions
  1. 6
    1
      src/freedombone-image-customise
  2. 7
    7
      src/freedombone-image-mesh
  3. 4
    4
      src/zeronetavahi

+ 6
- 1
src/freedombone-image-customise View File

706
     # to provide notifications
706
     # to provide notifications
707
     chroot "$rootdir" apt-get -y install libnotify-bin
707
     chroot "$rootdir" apt-get -y install libnotify-bin
708
 
708
 
709
-    # some dbus stuff to enable notifications
709
+    # Produce a text file on the desktop listing users on the mesh
710
+    cat <<EOF > $rootdir/usr/bin/list-tox-users
711
+#!/bin/bash
712
+lstox | awk -F ' ' '{\$1=""; print \$0}' | sed -e 's/^[[:space:]]*//' | sort -d > /home/$MY_USERNAME/Desktop/Users.txt
713
+EOF
714
+    echo "* *       * * *   $MY_USERNAME    /usr/bin/list-tox-users > /dev/null" >> $rootdir/etc/crontab
710
 
715
 
711
     if [[ $VARIANT != "usb" ]]; then
716
     if [[ $VARIANT != "usb" ]]; then
712
         # log in automatically
717
         # log in automatically

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

494
         return
494
         return
495
     fi
495
     fi
496
 
496
 
497
-    echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/users.desktop
498
-    echo 'Name=Users' >> /home/$MY_USERNAME/Desktop/users.desktop
499
-    echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/users.desktop
500
-    echo 'Comment=Users on the system' >> /home/$MY_USERNAME/Desktop/users.desktop
501
-    echo "Exec=$BROWSER $TOX_USERS_FILE" >> /home/$MY_USERNAME/Desktop/users.desktop
502
-    echo "Icon=$BROWSER" >> /home/$MY_USERNAME/Desktop/users.desktop
503
-    echo 'StartupNotify=true' >> /home/$MY_USERNAME/Desktop/users.desktop
497
+    #echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/users.desktop
498
+    #echo 'Name=Users' >> /home/$MY_USERNAME/Desktop/users.desktop
499
+    #echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/users.desktop
500
+    #echo 'Comment=Users on the system' >> /home/$MY_USERNAME/Desktop/users.desktop
501
+    #echo "Exec=$BROWSER $TOX_USERS_FILE" >> /home/$MY_USERNAME/Desktop/users.desktop
502
+    #echo "Icon=$BROWSER" >> /home/$MY_USERNAME/Desktop/users.desktop
503
+    #echo 'StartupNotify=true' >> /home/$MY_USERNAME/Desktop/users.desktop
504
 
504
 
505
     #echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/mesh.desktop
505
     #echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/mesh.desktop
506
     #echo 'Name=Mesh' >> /home/$MY_USERNAME/Desktop/mesh.desktop
506
     #echo 'Name=Mesh' >> /home/$MY_USERNAME/Desktop/mesh.desktop

+ 4
- 4
src/zeronetavahi View File

472
 fi
472
 fi
473
 
473
 
474
 ipfs_bootstrap
474
 ipfs_bootstrap
475
-detect_tox_users
475
+#detect_tox_users
476
 avahi_remove_info
476
 avahi_remove_info
477
 
477
 
478
 # make some html headers and footers
478
 # make some html headers and footers
496
     chown -R zeronet:zeronet $ZERONET_INSTALL
496
     chown -R zeronet:zeronet $ZERONET_INSTALL
497
 fi
497
 fi
498
 
498
 
499
-create_header $TOX_USERS_FILE $"Tox Users"
500
-create_footer $TOX_USERS_FILE
501
-assemble_web_page ${TOX_USERS_FILE} $ZERONET_INSTALL
499
+#create_header $TOX_USERS_FILE $"Tox Users"
500
+#create_footer $TOX_USERS_FILE
501
+#assemble_web_page ${TOX_USERS_FILE} $ZERONET_INSTALL
502
 
502
 
503
 exit 0
503
 exit 0