Pārlūkot izejas kodu

More intuitive use of desktop icons for mesh client

Bob Mottram 8 gadus atpakaļ
vecāks
revīzija
9701687ba6
Revīzijas autora e-pasts nav piesaistīts nevienam kontam
2 mainītis faili ar 42 papildinājumiem un 9 dzēšanām
  1. 42
    1
      src/freedombone-image-customise
  2. 0
    8
      src/freedombone-image-mesh

+ 42
- 1
src/freedombone-image-customise Parādīt failu

714
     # Produce a text file on the desktop listing users on the mesh
714
     # Produce a text file on the desktop listing users on the mesh
715
     cat <<EOF > $rootdir/usr/bin/list-tox-users
715
     cat <<EOF > $rootdir/usr/bin/list-tox-users
716
 #!/bin/bash
716
 #!/bin/bash
717
-lstox | awk -F ' ' '{\$1=""; print \$0}' | sed -e 's/^[[:space:]]*//' | sort -d > /home/$MY_USERNAME/Desktop/Users.txt
717
+users_list=\$(lstox | awk -F ' ' '{\$1=""; print \$0}' | sed -e 's/^[[:space:]]*//' | sort -d)
718
+if [ \${#users_list[@]} -gt 0 ]; then
719
+    echo "\$users_list" > /home/$MY_USERNAME/Users.txt
720
+    chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Users.txt
721
+    echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/Users.desktop
722
+    if [ \${#users_list[@]} -lt 2 ]; then
723
+        echo "Name=\${#users_list[@]} User" >> /home/$MY_USERNAME/Desktop/Users.desktop
724
+    else
725
+        echo "Name=\${#users_list[@]} Users" >> /home/$MY_USERNAME/Desktop/Users.desktop
726
+    fi
727
+    echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/Users.desktop
728
+    echo 'Comment=List of users' >> /home/$MY_USERNAME/Desktop/Users.desktop
729
+    echo 'Exec=pluma /home/$MY_USERNAME/Users.txt' >> /home/$MY_USERNAME/Desktop/Users.desktop
730
+    echo 'icon=pluma' >> /home/$MY_USERNAME/Desktop/Users.desktop
731
+    echo 'StartupNotify=false' >> /home/$MY_USERNAME/Desktop/Users.desktop
732
+    chmod +x /home/$MY_USERNAME/Desktop/Users.desktop
733
+    chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/Users.desktop
734
+
735
+    if [ ! -f /home/$MY_USERNAME/Desktop/tox.desktop ]; then
736
+        echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/tox.desktop
737
+        echo 'Name=Tox Chat' >> /home/$MY_USERNAME/Desktop/tox.desktop
738
+        echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/tox.desktop
739
+        echo 'Comment=Chat, VoIP and Video' >> /home/$MY_USERNAME/Desktop/tox.desktop
740
+        echo "Exec=bash -c 'qtox -p data'" >> /home/$MY_USERNAME/Desktop/tox.desktop
741
+        echo 'icon=qtox' >> /home/$MY_USERNAME/Desktop/tox.desktop
742
+        echo 'StartupNotify=true' >> /home/$MY_USERNAME/Desktop/tox.desktop
743
+        chmod +x /home/$MY_USERNAME/Desktop/tox.desktop
744
+        chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/tox.desktop
745
+    fi
746
+else
747
+    if [ -f /home/$MY_USERNAME/Users.txt ]; then
748
+        rm /home/$MY_USERNAME/Users.txt
749
+        rm /home/$MY_USERNAME/Desktop/Users.desktop
750
+        if [ -f /home/$MY_USERNAME/Desktop/Users.desktop ]; then
751
+            rm /home/$MY_USERNAME/Desktop/Users.desktop
752
+        fi
753
+        if [ -f /home/$MY_USERNAME/Desktop/tox.desktop ]; then
754
+            rm /home/$MY_USERNAME/Desktop/tox.desktop
755
+        fi
756
+        pkill qtox
757
+    fi
758
+fi
718
 EOF
759
 EOF
719
     chroot "$rootdir" chown $MY_USERNAME:$MY_USERNAME /usr/bin/list-tox-users
760
     chroot "$rootdir" chown $MY_USERNAME:$MY_USERNAME /usr/bin/list-tox-users
720
     chroot "$rootdir" chmod +x /usr/bin/list-tox-users
761
     chroot "$rootdir" chmod +x /usr/bin/list-tox-users

+ 0
- 8
src/freedombone-image-mesh Parādīt failu

477
         return
477
         return
478
     fi
478
     fi
479
 
479
 
480
-    echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/tox.desktop
481
-    echo 'Name=Tox Chat' >> /home/$MY_USERNAME/Desktop/tox.desktop
482
-    echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/tox.desktop
483
-    echo 'Comment=Chat, VoIP, Video' >> /home/$MY_USERNAME/Desktop/tox.desktop
484
-    echo "Exec=bash -c 'qtox -p data'" >> /home/$MY_USERNAME/Desktop/tox.desktop
485
-    echo 'Icon=qtox' >> /home/$MY_USERNAME/Desktop/tox.desktop
486
-    echo 'StartupNotify=true' >> /home/$MY_USERNAME/Desktop/tox.desktop
487
-
488
     chmod +x /home/$MY_USERNAME/Desktop/*.desktop
480
     chmod +x /home/$MY_USERNAME/Desktop/*.desktop
489
     chown ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/Desktop/*
481
     chown ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/Desktop/*
490
 }
482
 }