Przeglądaj źródła

Prevent qtox from being opened more than once

Bob Mottram 8 lat temu
rodzic
commit
a2e1a98b0b
Brak konta powiązanego z e-mailem autora
1 zmienionych plików z 10 dodań i 2 usunięć
  1. 10
    2
      src/freedombone-image-customise

+ 10
- 2
src/freedombone-image-customise Wyświetl plik

@@ -743,12 +743,20 @@ if [ \$no_of_users -gt 0 ]; then
743 743
     chmod +x /home/$MY_USERNAME/Desktop/Users.desktop
744 744
     chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/Users.desktop
745 745
 
746
-    if [ ! -f /home/$MY_USERNAME/Desktop/tox.desktop ]; then
746
+    if [ ! -f /home/$MY_USERNAME/runtox ]; then
747
+        echo 'qtox_running=\$(ps aux | grep qtox | grep data)' >> /home/$MY_USERNAME/runtox
748
+        echo 'if [ \${#qtox_running} -eq 0 ]; then' >> /home/$MY_USERNAME/runtox
749
+        echo '    bash -c "qtox -p data"' >> /home/$MY_USERNAME/runtox
750
+        echo 'fi' >> /home/$MY_USERNAME/runtox
751
+        echo 'exit 0' >> /home/$MY_USERNAME/runtox
752
+        chmod +x /home/$MY_USERNAME/runtox
753
+        chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/runtox
754
+
747 755
         echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/tox.desktop
748 756
         echo 'Name=Tox Chat' >> /home/$MY_USERNAME/Desktop/tox.desktop
749 757
         echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/tox.desktop
750 758
         echo 'Comment=Chat, VoIP and Video' >> /home/$MY_USERNAME/Desktop/tox.desktop
751
-        echo "Exec=bash -c 'qtox -p data'" >> /home/$MY_USERNAME/Desktop/tox.desktop
759
+        echo 'Exec=bash /usr/$MY_USERNAME/runtox' >> /home/$MY_USERNAME/Desktop/tox.desktop
752 760
         echo 'Icon=/usr/share/icons/hicolor/32x32/apps/qtox.png' >> /home/$MY_USERNAME/Desktop/tox.desktop
753 761
         echo 'StartupNotify=true' >> /home/$MY_USERNAME/Desktop/tox.desktop
754 762
         chmod +x /home/$MY_USERNAME/Desktop/tox.desktop