From 8200a265283df0bccd9a4c0d36798def79aeee39 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Thu, 11 Aug 2016 22:26:27 +0100
Subject: [PATCH] Replace web based mesh users list with a text file

This should load more quickly
---
 src/freedombone-image-customise |  7 ++++++-
 src/freedombone-image-mesh      | 14 +++++++-------
 src/zeronetavahi                |  8 ++++----
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index b15e25af..ea877ff3 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -706,7 +706,12 @@ function configure_user_interface {
     # to provide notifications
     chroot "$rootdir" apt-get -y install libnotify-bin
 
-    # some dbus stuff to enable notifications
+    # Produce a text file on the desktop listing users on the mesh
+    cat <<EOF > $rootdir/usr/bin/list-tox-users
+#!/bin/bash
+lstox | awk -F ' ' '{\$1=""; print \$0}' | sed -e 's/^[[:space:]]*//' | sort -d > /home/$MY_USERNAME/Desktop/Users.txt
+EOF
+    echo "* *       * * *   $MY_USERNAME    /usr/bin/list-tox-users > /dev/null" >> $rootdir/etc/crontab
 
     if [[ $VARIANT != "usb" ]]; then
         # log in automatically
diff --git a/src/freedombone-image-mesh b/src/freedombone-image-mesh
index 8c2b3114..3acca083 100755
--- a/src/freedombone-image-mesh
+++ b/src/freedombone-image-mesh
@@ -494,13 +494,13 @@ function show_desktop_icons {
         return
     fi
 
-    echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/users.desktop
-    echo 'Name=Users' >> /home/$MY_USERNAME/Desktop/users.desktop
-    echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/users.desktop
-    echo 'Comment=Users on the system' >> /home/$MY_USERNAME/Desktop/users.desktop
-    echo "Exec=$BROWSER $TOX_USERS_FILE" >> /home/$MY_USERNAME/Desktop/users.desktop
-    echo "Icon=$BROWSER" >> /home/$MY_USERNAME/Desktop/users.desktop
-    echo 'StartupNotify=true' >> /home/$MY_USERNAME/Desktop/users.desktop
+    #echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/users.desktop
+    #echo 'Name=Users' >> /home/$MY_USERNAME/Desktop/users.desktop
+    #echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/users.desktop
+    #echo 'Comment=Users on the system' >> /home/$MY_USERNAME/Desktop/users.desktop
+    #echo "Exec=$BROWSER $TOX_USERS_FILE" >> /home/$MY_USERNAME/Desktop/users.desktop
+    #echo "Icon=$BROWSER" >> /home/$MY_USERNAME/Desktop/users.desktop
+    #echo 'StartupNotify=true' >> /home/$MY_USERNAME/Desktop/users.desktop
 
     #echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/mesh.desktop
     #echo 'Name=Mesh' >> /home/$MY_USERNAME/Desktop/mesh.desktop
diff --git a/src/zeronetavahi b/src/zeronetavahi
index 79f0c5de..0f913de1 100755
--- a/src/zeronetavahi
+++ b/src/zeronetavahi
@@ -472,7 +472,7 @@ if [ $ENABLE_ZERONET ]; then
 fi
 
 ipfs_bootstrap
-detect_tox_users
+#detect_tox_users
 avahi_remove_info
 
 # make some html headers and footers
@@ -496,8 +496,8 @@ if [ $ENABLE_ZERONET ]; then
     chown -R zeronet:zeronet $ZERONET_INSTALL
 fi
 
-create_header $TOX_USERS_FILE $"Tox Users"
-create_footer $TOX_USERS_FILE
-assemble_web_page ${TOX_USERS_FILE} $ZERONET_INSTALL
+#create_header $TOX_USERS_FILE $"Tox Users"
+#create_footer $TOX_USERS_FILE
+#assemble_web_page ${TOX_USERS_FILE} $ZERONET_INSTALL
 
 exit 0