Bläddra i källkod

Change place where ssb mesh icons are initially created

Bob Mottram 7 år sedan
förälder
incheckning
1067b3e8cf
2 ändrade filer med 27 tillägg och 24 borttagningar
  1. 0
    24
      src/freedombone-image-customise
  2. 27
    0
      src/freedombone-image-mesh

+ 0
- 24
src/freedombone-image-customise Visa fil

@@ -600,18 +600,6 @@ EOF
600 600
 
601 601
     # Copy icon to an accesible location
602 602
     cp $rootdir/root/$PROJECT_NAME/img/icon_patchwork.png $rootdir/etc/patchwork/icon_patchwork.png
603
-
604
-    if [ -d $rootdir/home/$MY_USERNAME ]; then
605
-        echo '[Desktop Entry]' > $rootdir/home/$MY_USERNAME/Desktop/social.desktop
606
-        echo 'Name=Social (Offline)' >> $rootdir/home/$MY_USERNAME/Desktop/social.desktop
607
-        echo 'Type=Application' >> $rootdir/home/$MY_USERNAME/Desktop/social.desktop
608
-        echo 'Comment=A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB)' >> $rootdir/home/$MY_USERNAME/Desktop/social.desktop
609
-        echo 'Exec=bash /usr/bin/start_patchwork' >> $rootdir/home/$MY_USERNAME/Desktop/social.desktop
610
-        echo "Icon=/etc/patchwork/icon_patchwork.png" >> $rootdir/home/$MY_USERNAME/Desktop/social.desktop
611
-        echo 'StartupNotify=true' >> $rootdir/home/$MY_USERNAME/Desktop/social.desktop
612
-        chmod +x $rootdir/home/$MY_USERNAME/Desktop/social.desktop
613
-        chroot "$rootdir" chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/social.desktop
614
-    fi
615 603
 }
616 604
 
617 605
 install_ferment() {
@@ -649,18 +637,6 @@ EOF
649 637
 
650 638
     # Copy icon to an accesible location
651 639
     cp $rootdir/root/$PROJECT_NAME/img/icon_ferment.png $rootdir/etc/patchwork/icon_ferment.png
652
-
653
-    if [ -d $rootdir/home/$MY_USERNAME ]; then
654
-        echo '[Desktop Entry]' > $rootdir/home/$MY_USERNAME/Desktop/audio.desktop
655
-        echo 'Name=Audio/Music (Offline)' >> $rootdir/home/$MY_USERNAME/Desktop/audio.desktop
656
-        echo 'Type=Application' >> $rootdir/home/$MY_USERNAME/Desktop/audio.desktop
657
-        echo 'Comment=Audio publishing and streaming' >> $rootdir/home/$MY_USERNAME/Desktop/audio.desktop
658
-        echo 'Exec=bash /usr/bin/start_ferment' >> $rootdir/home/$MY_USERNAME/Desktop/audio.desktop
659
-        echo "Icon=/etc/patchwork/icon_ferment.png" >> $rootdir/home/$MY_USERNAME/Desktop/audio.desktop
660
-        echo 'StartupNotify=true' >> $rootdir/home/$MY_USERNAME/Desktop/audio.desktop
661
-        chmod +x $rootdir/home/$MY_USERNAME/Desktop/audio.desktop
662
-        chroot "$rootdir" chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/audio.desktop
663
-    fi
664 640
 }
665 641
 
666 642
 initialise_mesh() {

+ 27
- 0
src/freedombone-image-mesh Visa fil

@@ -792,6 +792,32 @@ function initialise_scuttlebot_pub {
792 792
     systemctl restart scuttlebot.service
793 793
 }
794 794
 
795
+function add_ssb_icons {
796
+    if [ ! -d /home/$MY_USERNAME/Desktop ]; then
797
+        return
798
+    fi
799
+
800
+    echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/social.desktop
801
+    echo 'Name=Social (Offline)' >> /home/$MY_USERNAME/Desktop/social.desktop
802
+    echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/social.desktop
803
+    echo 'Comment=A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB)' >> /home/$MY_USERNAME/Desktop/social.desktop
804
+    echo 'Exec=bash /usr/bin/start_patchwork' >> /home/$MY_USERNAME/Desktop/social.desktop
805
+    echo "Icon=/etc/patchwork/icon_patchwork.png" >> /home/$MY_USERNAME/Desktop/social.desktop
806
+    echo 'StartupNotify=true' >> /home/$MY_USERNAME/Desktop/social.desktop
807
+    chmod +x /home/$MY_USERNAME/Desktop/social.desktop
808
+    chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/social.desktop
809
+
810
+    echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/audio.desktop
811
+    echo 'Name=Audio/Music (Offline)' >> /home/$MY_USERNAME/Desktop/audio.desktop
812
+    echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/audio.desktop
813
+    echo 'Comment=Audio publishing and streaming' >> /home/$MY_USERNAME/Desktop/audio.desktop
814
+    echo 'Exec=bash /usr/bin/start_ferment' >> /home/$MY_USERNAME/Desktop/audio.desktop
815
+    echo "Icon=/etc/patchwork/icon_ferment.png" >> /home/$MY_USERNAME/Desktop/audio.desktop
816
+    echo 'StartupNotify=true' >> /home/$MY_USERNAME/Desktop/audio.desktop
817
+    chmod +x /home/$MY_USERNAME/Desktop/audio.desktop
818
+    chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/audio.desktop
819
+}
820
+
795 821
 # whether to reset the identity
796 822
 set_new_identity=
797 823
 if [ $2 ]; then
@@ -855,6 +881,7 @@ if [ -f $MESH_INSTALL_SETUP ]; then
855 881
     #setup_tahoelafs
856 882
     mesh_setup_vpn
857 883
     initialise_scuttlebot_pub
884
+    add_ssb_icons
858 885
     setup_ipfs
859 886
     mesh_amnesic
860 887
     make_root_read_only