From 4789e666252ad184ee3813403c89d37f4a0d48c1 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Tue, 24 Nov 2015 09:17:05 +0000 Subject: [PATCH] Expected extensions --- src/freedombone-image | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/freedombone-image b/src/freedombone-image index 154548b5..bc9f478c 100755 --- a/src/freedombone-image +++ b/src/freedombone-image @@ -163,6 +163,10 @@ rm $CURR_DIR/${PROJECT_NAME}*.sig rm $CURR_DIR/${PROJECT_NAME}*.vdi rm $CURR_DIR/${PROJECT_NAME}*.qcow2 +if [ -f ${CURR_DIR}/${PROJECT_NAME}_login_credentials.txt ]; then + rm ${CURR_DIR}/${PROJECT_NAME}_login_credentials.txt +fi + if [ -d $BUILD_DIR ]; then rm -rf $BUILD_DIR fi @@ -192,8 +196,16 @@ make $IMAGE_TYPE \ SSH_PUBKEY="$SSH_PUBKEY" \ GENERIC_IMAGE="$GENERIC_IMAGE" +EXPECTED_EXTENSION='img' +if [[ $IMAGE_TYPE == "qemu"* ]]; then + EXPECTED_EXTENSION='qcow2' +fi +if [[ $IMAGE_TYPE == "virtualbox"* ]]; then + EXPECTED_EXTENSION='vdi' +fi + shopt -s nullglob -imgfiles=(build/${PROJECT_NAME}*.img) +imgfiles=(build/${PROJECT_NAME}*.${EXPECTED_EXTENSION}) if [ ${#imgfiles[@]} -eq 0 ]; then echo 'Image was not created' rm -rf $BUILD_DIR