瀏覽代碼

Show desktop icon in the usual mesh manner

Bob Mottram 7 年之前
父節點
當前提交
ab283171dd
共有 1 個文件被更改,包括 10 次插入13 次删除
  1. 10
    13
      src/freedombone-image-customise

+ 10
- 13
src/freedombone-image-customise 查看文件

@@ -593,16 +593,6 @@ EOF
593 593
     echo 'cd /etc/patchwork' > $rootdir/usr/bin/start_patchwork
594 594
     echo 'npm start' > $rootdir/usr/bin/start_patchwork
595 595
     chmod +x $rootdir/usr/bin/start_patchwork
596
-
597
-    echo '[Desktop Entry]' > $rootdir/home/$MY_USERNAME/Desktop/social.desktop
598
-    echo 'Name=Social' >> $rootdir/home/$MY_USERNAME/Desktop/social.desktop
599
-    echo 'Type=Application' >> $rootdir/home/$MY_USERNAME/Desktop/social.desktop
600
-    echo 'Comment=A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB)' >> $rootdir/home/$MY_USERNAME/Desktop/social.desktop
601
-    echo 'Exec=bash /usr/bin/start_patchwork' >> $rootdir/home/$MY_USERNAME/Desktop/social.desktop
602
-    echo "Icon=/root/freedombone/img/icon_patchwork.png" >> $rootdir/home/$MY_USERNAME/Desktop/social.desktop
603
-    echo 'StartupNotify=true' >> $rootdir/home/$MY_USERNAME/Desktop/social.desktop
604
-    chmod +x $rootdir/home/$MY_USERNAME/Desktop/social.desktop
605
-    chown $MY_USERNAME:$MY_USERNAME $rootdir/home/$MY_USERNAME/Desktop/social.desktop
606 596
 }
607 597
 
608 598
 initialise_mesh() {
@@ -866,6 +856,16 @@ if [ \$no_of_users -gt 0 ]; then
866 856
     chmod +x /home/$MY_USERNAME/Desktop/Users.desktop
867 857
     chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/Users.desktop
868 858
 
859
+    echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/social.desktop
860
+    echo 'Name=Social' >> /home/$MY_USERNAME/Desktop/social.desktop
861
+    echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/social.desktop
862
+    echo 'Comment=A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB)' >> /home/$MY_USERNAME/Desktop/social.desktop
863
+    echo 'Exec=bash /usr/bin/start_patchwork' >> /home/$MY_USERNAME/Desktop/social.desktop
864
+    echo "Icon=/root/freedombone/img/icon_patchwork.png" >> /home/$MY_USERNAME/Desktop/social.desktop
865
+    echo 'StartupNotify=true' >> /home/$MY_USERNAME/Desktop/social.desktop
866
+    chmod +x /home/$MY_USERNAME/Desktop/social.desktop
867
+    chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/social.desktop
868
+
869 869
     if [ -f /tmp/.ipfs-users ]; then
870 870
         echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/sites.desktop
871 871
         echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/sites.desktop
@@ -909,9 +909,6 @@ if [ \$no_of_users -gt 0 ]; then
909 909
         chmod +x /home/$MY_USERNAME/Desktop/tox.desktop
910 910
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/tox.desktop
911 911
     fi
912
-    if [ -f /home/$MY_USERNAME/Desktop/social.desktop ]; then
913
-        sed -i 's|Name=.*|Name=Social|g' /home/$MY_USERNAME/Desktop/social.desktop
914
-    fi
915 912
 else
916 913
     if [ -f /tmp/Users.txt ]; then
917 914
         rm /tmp/Users.txt