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

Replace web based mesh users list with a text file 

This should load more quickly
This commit is contained in:
Bob Mottram 2016-08-11 22:26:27 +01:00
parent 9146f5ba50
commit 8200a26528
No known key found for this signature in database
GPG Key ID: 0452CC7CEA982E38
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/freedombone-image-customise
View File

@ -706,7 +706,12 @@ function configure_user_interface {
# to provide notifications # to provide notifications
chroot "$rootdir" apt-get -y install libnotify-bin 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 if [[ $VARIANT != "usb" ]]; then
# log in automatically # log in automatically

14
src/freedombone-image-mesh
View File

@ -494,13 +494,13 @@ function show_desktop_icons {
return return
fi fi
echo '[Desktop Entry]' > /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 'Name=Users' >> /home/$MY_USERNAME/Desktop/users.desktop
echo 'Type=Application' >> /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 'Comment=Users on the system' >> /home/$MY_USERNAME/Desktop/users.desktop
echo "Exec=$BROWSER $TOX_USERS_FILE" >> /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 "Icon=$BROWSER" >> /home/$MY_USERNAME/Desktop/users.desktop
echo 'StartupNotify=true' >> /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 '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/mesh.desktop
#echo 'Name=Mesh' >> /home/$MY_USERNAME/Desktop/mesh.desktop #echo 'Name=Mesh' >> /home/$MY_USERNAME/Desktop/mesh.desktop

8
src/zeronetavahi
View File

@ -472,7 +472,7 @@ if [ $ENABLE_ZERONET ]; then
fi fi
ipfs_bootstrap ipfs_bootstrap
detect_tox_users #detect_tox_users
avahi_remove_info avahi_remove_info
# make some html headers and footers # make some html headers and footers
@ -496,8 +496,8 @@ if [ $ENABLE_ZERONET ]; then
chown -R zeronet:zeronet $ZERONET_INSTALL chown -R zeronet:zeronet $ZERONET_INSTALL
fi fi
create_header $TOX_USERS_FILE $"Tox Users" #create_header $TOX_USERS_FILE $"Tox Users"
create_footer $TOX_USERS_FILE #create_footer $TOX_USERS_FILE
assemble_web_page ${TOX_USERS_FILE} $ZERONET_INSTALL #assemble_web_page ${TOX_USERS_FILE} $ZERONET_INSTALL
exit 0 exit 0