From 9b0fdb224a85190fbfbd30907cfadbf98e60020d Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Sat, 30 Jul 2016 14:39:08 +0100
Subject: [PATCH] Tidying

---
 src/freedombone-image      | 2 +-
 src/freedombone-image-mesh | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/freedombone-image b/src/freedombone-image
index 75c80cc6..692bf590 100755
--- a/src/freedombone-image
+++ b/src/freedombone-image
@@ -471,7 +471,7 @@ Password: $PASSWORD
 		fi
 	fi
 else
-		echo $"
+	echo $"
 Image was created.
 "
 fi
diff --git a/src/freedombone-image-mesh b/src/freedombone-image-mesh
index a189c1c9..9739623f 100755
--- a/src/freedombone-image-mesh
+++ b/src/freedombone-image-mesh
@@ -505,6 +505,8 @@ function show_desktop_icons {
 	echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
 
 	chown ${MY_DESKTOP}:${MY_DESKTOP} /home/$MY_USERNAME/Desktop/*
+
+	pkill caja
 }
 
 function disable_password_logins {
@@ -794,10 +796,6 @@ if [ -f $MESH_INSTALL_SETUP ]; then
 	if [ ! -f $MESH_AMNESIC ]; then
 		rm $MESH_INSTALL_SETUP
 		systemctl disable mesh-setup.service
-	else
-
-	if [ -d /home/${MY_USERNAME}/Desktop ]; then
-		pkill caja
 	fi
 
 	show_desktop_icons