Merge branch 'main' of github.com:kevinveenbirkenbach/cleanup-failed-docker-backups

README.md

@@ -15,7 +15,7 @@ For more detailed information about the script's workings, refer to the comments
 To use this script, clone this repository to your local system and run the script with the necessary arguments. The command should be structured as follows:
 
 ```bash
-bash cleanup.sh BACKUP_HASH TRIGGER_DIRECTORY
+bash cleanup.sh BACKUP_HASH
 ```
 
 Replace ```BACKUP_HASH``` and ```TRIGGER_DIRECTORY``` with your actual values.

cleanup.sh

@@ -12,20 +12,21 @@ else
     exit 1
 fi
 
-# Define trigger directory argument as TRIGGER_DIR
-TRIGGER_DIR="$2"
-
 # Loop through all subdirectories in the main directory
 for SUBDIR in "$MAIN_DIRECTORY"/*; do
 
     # Only proceed if it is a directory
     if [ -d "$SUBDIR" ]; then
         echo "Validating directory: $SUBDIR"
-            # Only proceed if the specified trigger directory does not exist within the subdirectory
+
-            FULL_TRIGGER_DIR_PATH="$SUBDIR/$TRIGGER_DIR"
+        # Call the Python script for validation
-            if [ ! -d "$FULL_TRIGGER_DIR_PATH" ]; then
+        python ../directory-validator/directory-validator.py "$SUBDIR" --validate
+        VALIDATION_STATUS=$?
+
+        if [ $VALIDATION_STATUS -eq 0 ]; then
+            echo "Validation: ok"
+        else
             echo "Validation: error"
-                echo "Missing directory: $FULL_TRIGGER_DIR_PATH"
             # Display the subdirectory contents
             echo "Contents of subdirectory: $SUBDIR"
             ls "$SUBDIR"
@@ -39,9 +40,6 @@ for SUBDIR in "$MAIN_DIRECTORY"/*; do
                 echo "Deleting subdirectory: $SUBDIR"
                 rm -vrf "$SUBDIR"
             fi
-            else
-                echo "Validation: ok"
-                echo "$SUBDIR contains $FULL_TRIGGER_DIR_PATH."
         fi
     fi
 done