From f082c9704b1118861389d76b0ba004d798503878 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Tue, 15 Jan 2019 12:41:39 +0000
Subject: [PATCH] Tidying

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

diff --git a/src/freedombone-image b/src/freedombone-image
index 6635f092c..b7e9ad08b 100755
--- a/src/freedombone-image
+++ b/src/freedombone-image
@@ -497,7 +497,7 @@ do
     shift
 done
 
-if [[ $INTERACTIVE == "yes" || $INTERACTIVE == "y" || $INTERACTIVE == "Yes" ]]; then
+if [[ "$INTERACTIVE" == "yes" || "$INTERACTIVE" == "y" || "$INTERACTIVE" == "Yes" ]]; then
     ${PROJECT_NAME}-config --minimal "$MINIMAL_INSTALL"
     if [ -f "$HOME/${PROJECT_NAME}.cfg" ]; then
         CONFIG_FILENAME=$HOME/${PROJECT_NAME}.cfg
@@ -505,12 +505,12 @@ if [[ $INTERACTIVE == "yes" || $INTERACTIVE == "y" || $INTERACTIVE == "Yes" ]];
     fi
 fi
 
-if [[ $GENERIC_IMAGE == "yes" ]]; then
+if [[ "$GENERIC_IMAGE" == "yes" ]]; then
     USERNAME=$GENERIC_IMAGE_USERNAME
     PASSWORD=$GENERIC_IMAGE_PASSWORD
 fi
 
-if [ ! $PASSWORD ]; then
+if [ ! "$PASSWORD" ]; then
     # generate a random password
     PASSWORD=$(openssl rand -base64 32 | tr -dc A-Za-z0-9 | head -c "${MINIMUM_PASSWORD_LENGTH}")
 fi
@@ -562,7 +562,7 @@ if [[ "$IMAGE_TYPE" == 'beagle'* ]]; then
     fi
 fi
 
-if [[ $VARIANT == 'mesh' ]]; then
+if [[ "$VARIANT" == 'mesh' ]]; then
     IMAGE_NAME=$'mesh'
     # typically not much disk space is needed for a mesh node
     if [ ! $IMAGE_SIZE_SPECIFIED ]; then
@@ -570,7 +570,7 @@ if [[ $VARIANT == 'mesh' ]]; then
     fi
 fi
 
-if [[ $VARIANT == 'meshclient' || $VARIANT == 'meshusb' ]]; then
+if [[ "$VARIANT" == 'meshclient' || $VARIANT == 'meshusb' ]]; then
     IMAGE_NAME=$'meshclient'
     if [[ $INSECURE != 'no' ]]; then
         IMAGE_NAME=$'meshclient-insecure'
@@ -581,12 +581,12 @@ if [[ $VARIANT == 'meshclient' || $VARIANT == 'meshusb' ]]; then
     #fi
 fi
 
-if [[ $VARIANT == 'usb' ]]; then
+if [[ "$VARIANT" == 'usb' ]]; then
     IMAGE_NAME=$'usb'
 fi
 
 # append amnesic to the image name if needed
-if [[ $AMNESIC != 'no' ]]; then
+if [[ "$AMNESIC" != 'no' ]]; then
     IMAGE_NAME="${IMAGE_NAME}-amnesic"
 fi
 
@@ -715,7 +715,7 @@ fi
 #ls -lh ${PROJECT_NAME}*.img ${PROJECT_NAME}*.asc ${PROJECT_NAME}*.xz ${PROJECT_NAME}*.vdi ${PROJECT_NAME}*.qcow2
 
 # Remove the mesh script after use
-if [[ $VARIANT == "mesh"* ]]; then
+if [[ "$VARIANT" == "mesh"* ]]; then
     rm -f "$CONFIG_FILENAME"
 fi
 
@@ -724,19 +724,24 @@ echo $"Username: $USERNAME
 Password: $PASSWORD" > "${CURR_DIR}/${PROJECT_NAME}_login_credentials.txt"
 chmod 600 "${CURR_DIR}/${PROJECT_NAME}_login_credentials.txt"
 
-if [[ $IMAGE_TYPE != "qemu"* ]]; then
+if [[ "$IMAGE_TYPE" != "qemu"* ]]; then
     IMAGE_FILENAME=$(find . -name "*.img" | grep -v 'build/' | head -n 1 | awk -F '/' '{print $2}')
+else
+    IMAGE_FILENAME=$(find . -name "*.qcow2" | grep -v 'build/' | head -n 1 | awk -F '/' '{print $2}')
+fi
 
-    echo ''
-    echo $'To compress:'
-    echo ''
-    echo "  sudo chown $CURR_USER: ${IMAGE_FILENAME}"
-    echo "  xz --no-warn --verbose --keep --threads=0 -3 ${IMAGE_FILENAME}"
-    echo ''
-    echo $'To sign:'
-    echo ''
-    echo "  gpg -ba ${IMAGE_FILENAME}.xz"
-    echo ''
+echo ''
+echo $'To compress:'
+echo ''
+echo "  sudo chown $CURR_USER: ${IMAGE_FILENAME}"
+echo "  xz --no-warn --verbose --keep --threads=0 -3 ${IMAGE_FILENAME}"
+echo ''
+echo $'To sign:'
+echo ''
+echo "  gpg -ba ${IMAGE_FILENAME}.xz"
+echo ''
+
+if [[ "$IMAGE_TYPE" != "qemu"* ]]; then
     echo 'To copy to microSD, USB drive or SSD'
     echo ''
     echo '  sudo dd if=/dev/zero of=/dev/sdX bs=1M count=8'
-- 
GitLab