From 2f9f5be961054240f9d18b5f1dd9665de00e7d79 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 17 May 2018 18:05:24 +0100
Subject: [PATCH] More explicit instructions on copying image

---
 src/freedombone-image | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/freedombone-image b/src/freedombone-image
index fb202a3e..968501d6 100755
--- a/src/freedombone-image
+++ b/src/freedombone-image
@@ -697,7 +697,7 @@ Image was created.
 "
 fi
 
-ls -lh ${PROJECT_NAME}*.img ${PROJECT_NAME}*.sig ${PROJECT_NAME}*.xz ${PROJECT_NAME}*.vdi ${PROJECT_NAME}*.qcow2
+#ls -lh ${PROJECT_NAME}*.img ${PROJECT_NAME}*.sig ${PROJECT_NAME}*.xz ${PROJECT_NAME}*.vdi ${PROJECT_NAME}*.qcow2
 
 # Remove the mesh script after use
 if [[ $VARIANT == "mesh"* ]]; then
@@ -710,16 +710,17 @@ Password: $PASSWORD" > "${CURR_DIR}/${PROJECT_NAME}_login_credentials.txt"
 chmod 600 "${CURR_DIR}/${PROJECT_NAME}_login_credentials.txt"
 
 if [[ $IMAGE_TYPE != "qemu"* ]]; then
+    IMAGE_FILENAME=$(find "${CURR_DIR}" -name "*.img" | head -n 1 | awk -F '/' '{print $2}')
+
     echo ''
-    if [[ $VARIANT != 'meshclient' && $VARIANT != 'meshusb' ]]; then
-        echo $'You can copy the image to a microSD card with:'
-    else
-        echo $'You can copy the image to a USB drive with:'
-    fi
+    echo $'To compress:'
     echo ''
-    echo "    unxz -k ${PROJECT_NAME}*.img.xz"
-    echo '    sudo dd if=/dev/zero of=/dev/sdX bs=32M count=8'
-    echo "    sudo dd bs=32M if=${PROJECT_NAME}*.img of=/dev/sdX conv=fdatasync,sync,noerror"
+    echo "  xz --no-warn --verbose --keep --threads=0 -3 ${IMAGE_FILENAME}"
+    echo ''
+    echo 'To copy to microSD, USB drive or SSD'
+    echo ''
+    echo '  sudo dd if=/dev/zero of=/dev/sdX bs=32M count=8'
+    echo "  sudo dd bs=32M if=${IMAGE_FILENAME} of=/dev/sdX conv=fdatasync,sync,noerror"
     echo ''
 fi