From ab283171dd1f11b6885e62d5a369d1c3ea8541af Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 17 Sep 2017 15:52:02 +0100
Subject: [PATCH] Show desktop icon in the usual mesh manner

---
 src/freedombone-image-customise | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index 4254968de..9b364d939 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -593,16 +593,6 @@ EOF
     echo 'cd /etc/patchwork' > $rootdir/usr/bin/start_patchwork
     echo 'npm start' > $rootdir/usr/bin/start_patchwork
     chmod +x $rootdir/usr/bin/start_patchwork
-
-    echo '[Desktop Entry]' > $rootdir/home/$MY_USERNAME/Desktop/social.desktop
-    echo 'Name=Social' >> $rootdir/home/$MY_USERNAME/Desktop/social.desktop
-    echo 'Type=Application' >> $rootdir/home/$MY_USERNAME/Desktop/social.desktop
-    echo 'Comment=A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB)' >> $rootdir/home/$MY_USERNAME/Desktop/social.desktop
-    echo 'Exec=bash /usr/bin/start_patchwork' >> $rootdir/home/$MY_USERNAME/Desktop/social.desktop
-    echo "Icon=/root/freedombone/img/icon_patchwork.png" >> $rootdir/home/$MY_USERNAME/Desktop/social.desktop
-    echo 'StartupNotify=true' >> $rootdir/home/$MY_USERNAME/Desktop/social.desktop
-    chmod +x $rootdir/home/$MY_USERNAME/Desktop/social.desktop
-    chown $MY_USERNAME:$MY_USERNAME $rootdir/home/$MY_USERNAME/Desktop/social.desktop
 }
 
 initialise_mesh() {
@@ -866,6 +856,16 @@ if [ \$no_of_users -gt 0 ]; then
     chmod +x /home/$MY_USERNAME/Desktop/Users.desktop
     chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/Users.desktop
 
+    echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/social.desktop
+    echo 'Name=Social' >> /home/$MY_USERNAME/Desktop/social.desktop
+    echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/social.desktop
+    echo 'Comment=A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB)' >> /home/$MY_USERNAME/Desktop/social.desktop
+    echo 'Exec=bash /usr/bin/start_patchwork' >> /home/$MY_USERNAME/Desktop/social.desktop
+    echo "Icon=/root/freedombone/img/icon_patchwork.png" >> /home/$MY_USERNAME/Desktop/social.desktop
+    echo 'StartupNotify=true' >> /home/$MY_USERNAME/Desktop/social.desktop
+    chmod +x /home/$MY_USERNAME/Desktop/social.desktop
+    chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/social.desktop
+
     if [ -f /tmp/.ipfs-users ]; then
         echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/sites.desktop
         echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/sites.desktop
@@ -909,9 +909,6 @@ if [ \$no_of_users -gt 0 ]; then
         chmod +x /home/$MY_USERNAME/Desktop/tox.desktop
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/tox.desktop
     fi
-    if [ -f /home/$MY_USERNAME/Desktop/social.desktop ]; then
-        sed -i 's|Name=.*|Name=Social|g' /home/$MY_USERNAME/Desktop/social.desktop
-    fi
 else
     if [ -f /tmp/Users.txt ]; then
         rm /tmp/Users.txt
-- 
GitLab