소스 검색

Better handling of the social icon on mesh desktop

Bob Mottram 7 년 전
부모
커밋
0f72006fd0
1개의 변경된 파일18개의 추가작업 그리고 9개의 파일을 삭제
  1. 18
    9
      src/freedombone-image-customise

+ 18
- 9
src/freedombone-image-customise 파일 보기

593
     echo 'cd /etc/patchwork' >> $rootdir/usr/bin/start_patchwork
593
     echo 'cd /etc/patchwork' >> $rootdir/usr/bin/start_patchwork
594
     echo 'npm start' >> $rootdir/usr/bin/start_patchwork
594
     echo 'npm start' >> $rootdir/usr/bin/start_patchwork
595
     chmod +x $rootdir/usr/bin/start_patchwork
595
     chmod +x $rootdir/usr/bin/start_patchwork
596
+
597
+    # Copy icon to an accesible location
598
+    cp /root/$PROJECT_NAME/img/icon_patchwork.png /etc/patchwork/icon_patchwork.png
596
 }
599
 }
597
 
600
 
598
 initialise_mesh() {
601
 initialise_mesh() {
856
     chmod +x /home/$MY_USERNAME/Desktop/Users.desktop
859
     chmod +x /home/$MY_USERNAME/Desktop/Users.desktop
857
     chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/Users.desktop
860
     chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/Users.desktop
858
 
861
 
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
862
+    if [ ! -f /home/$MY_USERNAME/Desktop/social.desktop ]; then
863
+        echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/social.desktop
864
+        echo 'Name=Social' >> /home/$MY_USERNAME/Desktop/social.desktop
865
+        echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/social.desktop
866
+        echo 'Comment=A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB)' >> /home/$MY_USERNAME/Desktop/social.desktop
867
+        echo 'Exec=bash /usr/bin/start_patchwork' >> /home/$MY_USERNAME/Desktop/social.desktop
868
+        echo "Icon=/etc/patchwork/icon_patchwork.png" >> /home/$MY_USERNAME/Desktop/social.desktop
869
+        echo 'StartupNotify=true' >> /home/$MY_USERNAME/Desktop/social.desktop
870
+        chmod +x /home/$MY_USERNAME/Desktop/social.desktop
871
+        chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/social.desktop
872
+    else
873
+        if grep -q "Offline" /home/$MY_USERNAME/Desktop/social.desktop; then
874
+            sed -i 's|Name=.*|Name=Social|g' /home/$MY_USERNAME/Desktop/social.desktop
875
+        fi
876
+    fi
868
 
877
 
869
     if [ -f /tmp/.ipfs-users ]; then
878
     if [ -f /tmp/.ipfs-users ]; then
870
         echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/sites.desktop
879
         echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/sites.desktop