Browse Source

Expected extensions

Bob Mottram 9 years ago
parent
commit
4789e66625
1 changed files with 13 additions and 1 deletions
  1. 13
    1
      src/freedombone-image

+ 13
- 1
src/freedombone-image View File

163
 rm $CURR_DIR/${PROJECT_NAME}*.vdi
163
 rm $CURR_DIR/${PROJECT_NAME}*.vdi
164
 rm $CURR_DIR/${PROJECT_NAME}*.qcow2
164
 rm $CURR_DIR/${PROJECT_NAME}*.qcow2
165
 
165
 
166
+if [ -f ${CURR_DIR}/${PROJECT_NAME}_login_credentials.txt ]; then
167
+    rm ${CURR_DIR}/${PROJECT_NAME}_login_credentials.txt
168
+fi
169
+
166
 if [ -d $BUILD_DIR ]; then
170
 if [ -d $BUILD_DIR ]; then
167
     rm -rf $BUILD_DIR
171
     rm -rf $BUILD_DIR
168
 fi
172
 fi
192
     SSH_PUBKEY="$SSH_PUBKEY" \
196
     SSH_PUBKEY="$SSH_PUBKEY" \
193
     GENERIC_IMAGE="$GENERIC_IMAGE"
197
     GENERIC_IMAGE="$GENERIC_IMAGE"
194
 
198
 
199
+EXPECTED_EXTENSION='img'
200
+if [[ $IMAGE_TYPE == "qemu"* ]]; then
201
+    EXPECTED_EXTENSION='qcow2'
202
+fi
203
+if [[ $IMAGE_TYPE == "virtualbox"* ]]; then
204
+    EXPECTED_EXTENSION='vdi'
205
+fi
206
+
195
 shopt -s nullglob
207
 shopt -s nullglob
196
-imgfiles=(build/${PROJECT_NAME}*.img)
208
+imgfiles=(build/${PROJECT_NAME}*.${EXPECTED_EXTENSION})
197
 if [ ${#imgfiles[@]} -eq 0 ]; then
209
 if [ ${#imgfiles[@]} -eq 0 ]; then
198
     echo 'Image was not created'
210
     echo 'Image was not created'
199
     rm -rf $BUILD_DIR
211
     rm -rf $BUILD_DIR