Expected extensions

This commit is contained in:
Bob Mottram 2015-11-24 09:17:05 +00:00
parent 11ea8d45a7
commit 4789e66625
1 changed files with 13 additions and 1 deletions

View File

@ -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