Skip execution if logs from previous run exists

ruzickap · Sep 4, 2018 · dba7dab · dba7dab
1 parent 59b6cb8
commit dba7dab
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/vagrant_init_destroy_boxes.sh b/vagrant_init_destroy_boxes.sh
@@ -74,15 +74,20 @@ main() {
       export VAGRANT_BOX_NAME_SHORT=`basename $VAGRANT_BOX_FILE | cut -d - -f 1,2,3`
       export VAGRANT_BOX_PROVIDER=${VAGRANT_BOX_NAME##*-}
       export VAGRANT_CWD="$TMPDIR/$VAGRANT_BOX_NAME_SHORT"
+      export LOG_FILE="$LOGDIR/${VAGRANT_BOX_NAME}_vagrant_init_destroy_boxes.log"
 
-      echo -e "*** ${VAGRANT_BOX_FILE} [$VAGRANT_BOX_NAME] ($VAGRANT_BOX_PROVIDER) ($TMPDIR/$VAGRANT_BOX_NAME_SHORT)" | tee $LOGDIR/$VAGRANT_BOX_NAME
+      if [ -f $LOG_FILE ]; then
+        echo -e "\n*** Logfile \"$LOG_FILE\" exist, please remove it... Skipping...\n"
+        continue
+      fi
+      echo -e "*** ${VAGRANT_BOX_FILE} [$VAGRANT_BOX_NAME] ($VAGRANT_BOX_PROVIDER) ($TMPDIR/$VAGRANT_BOX_NAME_SHORT)" | tee $LOG_FILE
       test -d "$VAGRANT_CWD" && rm -rf "$VAGRANT_CWD"
       mkdir "$VAGRANT_CWD"
 
       vagrant_box_add
       vagrant_init_up
 
-      check_vagrant_vm 2>&1 | tee -a $LOGDIR/$VAGRANT_BOX_NAME
+      check_vagrant_vm 2>&1 | tee -a $LOG_FILE
 
       #echo "Press ENTER to destroy the VMs"
       #read A

diff --git a/vagrant_init_destroy_boxes_docker.sh b/vagrant_init_destroy_boxes_docker.sh
@@ -7,24 +7,31 @@ VAGRANT_BOX_FILE=$1
 vagrant_box() {
   docker run --rm -t -u $(id -u):$(id -g) --privileged --net=host \
   -e HOME=/home/docker \
-  -e LOGDIR=$LOGDIR \
+  -e LOGDIR=/home/docker/vagrant_logdir \
   -v /dev/vboxdrv:/dev/vboxdrv \
   -v /var/run/libvirt/libvirt-sock:/var/run/libvirt/libvirt-sock \
   -v $VAGRANT_INIT_DESTROY_BOXES_SCRIPT_PATH:/home/docker/vagrant_script \
   -v $VAGRANT_BOX_FILE_BASE_DIR:/home/docker/vagrant \
+  -v $LOGDIR:/home/docker/vagrant_logdir \
   peru/vagrant_libvirt_virtualbox /home/docker/vagrant_script/vagrant_init_destroy_boxes.sh $VAGRANT_BOX_FILE_BASENAME
 }
 
 
-
 #######
 # Main
 #######
 
 main() {
     VAGRANT_BOX_FILE_BASE_DIR=$(dirname $VAGRANT_BOX_FILE)
     VAGRANT_BOX_FILE_BASENAME=$(basename $VAGRANT_BOX_FILE)
-    vagrant_box
+    VAGRANT_BOX_NAME=${VAGRANT_BOX_FILE_BASENAME%.*}
+    LOG_FILE="$LOGDIR/${VAGRANT_BOX_NAME}_vagrant_init_destroy_boxes.log"
+
+    if [ -f $LOG_FILE ]; then
+      echo -e "\n*** Logfile \"$LOG_FILE\" exist, please remove it... Skipping...\n"
+    else
+      vagrant_box
+    fi
 }
 
 main