Преглед на файлове

Only allow the users list to be opened once

Bob Mottram преди 8 години
родител
ревизия
e0a800f608
No account linked to committer's email
променени са 1 файла, в които са добавени 13 реда и са изтрити 2 реда
  1. 13
    2
      src/freedombone-image-customise

+ 13
- 2
src/freedombone-image-customise Целия файл

@@ -116,6 +116,8 @@ MESH_SET_USERNAME=$"Welcome to the Freedombone mesh.\n\nThe first thing you will
116 116
 # Whether to enable zeronet on the mesh
117 117
 ENABLE_ZERONET=
118 118
 
119
+MESH_TEXT_EDITOR='pluma'
120
+
119 121
 function configure_backports {
120 122
     echo "deb http://${DEBIAN_REPO}/debian/ ${DEBIAN_VERSION}-backports main" >> $rootdir/etc/apt/sources.list
121 123
 }
@@ -729,6 +731,15 @@ fi
729 731
 if [ \$no_of_users -gt 0 ]; then
730 732
     echo "\$users_list" > /home/$MY_USERNAME/Users.txt
731 733
     chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Users.txt
734
+
735
+    echo 'showing_users=\$(ps aux | grep $MESH_TEXT_EDITOR | grep "Users.txt")' > /home/$MY_USERNAME/showusers
736
+    echo 'if [ \${#showing_users} -eq 0 ]; then' >> /home/$MY_USERNAME/showusers
737
+    echo '    $MESH_TEXT_EDITOR /home/$MY_USERNAME/Users.txt' >> /home/$MY_USERNAME/showusers
738
+    echo 'fi' >> /home/$MY_USERNAME/showusers
739
+    echo 'exit 0' >> /home/$MY_USERNAME/showusers
740
+    chmod +x /home/$MY_USERNAME/showusers
741
+    chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/showusers
742
+
732 743
     echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/Users.desktop
733 744
     if [ \$no_of_users -lt 2 ]; then
734 745
         echo "Name=\$no_of_users Other User" >> /home/$MY_USERNAME/Desktop/Users.desktop
@@ -737,14 +748,14 @@ if [ \$no_of_users -gt 0 ]; then
737 748
     fi
738 749
     echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/Users.desktop
739 750
     echo 'Comment=List of users' >> /home/$MY_USERNAME/Desktop/Users.desktop
740
-    echo 'Exec=pluma /home/$MY_USERNAME/Users.txt' >> /home/$MY_USERNAME/Desktop/Users.desktop
751
+    echo 'Exec=bash /home/$MY_USERNAME/showusers' >> /home/$MY_USERNAME/Desktop/Users.desktop
741 752
     echo 'Icon=/usr/share/freedombone/avatars/anon002.jpg' >> /home/$MY_USERNAME/Desktop/Users.desktop
742 753
     echo 'StartupNotify=false' >> /home/$MY_USERNAME/Desktop/Users.desktop
743 754
     chmod +x /home/$MY_USERNAME/Desktop/Users.desktop
744 755
     chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/Users.desktop
745 756
 
746 757
     if [ ! -f /home/$MY_USERNAME/runtox ]; then
747
-        echo 'qtox_running=\$(ps aux | grep qtox | grep data)' >> /home/$MY_USERNAME/runtox
758
+        echo 'qtox_running=\$(ps aux | grep qtox | grep data)' > /home/$MY_USERNAME/runtox
748 759
         echo 'if [ \${#qtox_running} -eq 0 ]; then' >> /home/$MY_USERNAME/runtox
749 760
         echo '    bash -c "qtox -p data"' >> /home/$MY_USERNAME/runtox
750 761
         echo 'fi' >> /home/$MY_USERNAME/runtox