From 260280f96d5921a8f51855452c1d53c653207a5e Mon Sep 17 00:00:00 2001
From: mag37 <robin.ivehult@gmail.com>
Date: Sun, 7 Dec 2025 18:42:25 +0100
Subject: [PATCH] Moved the backup - cleanup to always trigger if -b option is
 usd. Added -p&-b warning.

---
 dockcheck.sh | 47 +++++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/dockcheck.sh b/dockcheck.sh
index 7b98f02..c3dfb35 100755
--- a/dockcheck.sh
+++ b/dockcheck.sh
@@ -176,6 +176,7 @@ if [[ -n "$BackupForDays" ]]; then
     printf "-b argument given (%s) is not a number.\n" "$BackupForDays"
     exit 2
   fi
+  [[ "$AutoPrune" == true ]] && printf "%bWARNING: When -b option is used, -p has no function.%b\n" "$c_yellow" "$c_reset"
 fi
 if [[ -n "$CollectorTextFileDirectory" ]]; then
   if ! [[ -d  $CollectorTextFileDirectory ]]; then
@@ -662,28 +663,8 @@ if [[ -n "${GotUpdates:-}" ]]; then
     fi
     printf "\n%bAll updates done!%b\n" "$c_green" "$c_reset"
 
-    # Clean up old backup image tags if -b is used
-    if [[ -n "${BackupForDays:-}" ]]; then
-      IFS=$'\n'
-      CleanupCount=0
-      for backup_img in $(docker images --format "{{.Repository}} {{.Tag}}" | sed -n '/^dockcheck/p'); do
-        repo_name=${backup_img% *}
-        backup_tag=${backup_img#* }
-        backup_date=${backup_tag%%_*}
-        # UNTAGGING HERE
-        if datecheck "$backup_date" "$BackupForDays"; then
-          [[ "$CleanupCount" == 0 ]] && echo "Removing backed up images older then $BackupForDays days."
-          docker rmi "${repo_name}:${backup_tag}" && ((CleanupCount+=1))
-        fi
-      done
-      unset IFS
-      if [[ "$CleanupCount" == 0 ]]; then
-        printf "\nNo backup images to remove.\n"
-      else
-        printf "\n%b%s%b backup images removed.%b\n" "$c_green" "$CleanupCount" "$c_teal" "$c_reset"
-        docker image prune -f
-      fi
-    else
+    # Trigger pruning only when backup-function is not used
+    if [[ -z "${BackupForDays:-}" ]]; then
       if [[ "$AutoPrune" == false ]] && [[ "$AutoMode" == false ]]; then printf "\n"; read -rep "Would you like to prune all dangling images? y/[n]: " AutoPrune; fi
       if [[ "$AutoPrune" == true ]] || [[ "$AutoPrune" =~ [yY] ]]; then printf "\nAuto pruning.."; docker image prune -f; fi
     fi
@@ -695,4 +676,26 @@ else
   printf "\nNo updates available.\n"
 fi
 
+# Clean up old backup image tags if -b is used
+if [[ -n "${BackupForDays:-}" ]]; then
+  IFS=$'\n'
+  CleanupCount=0
+  for backup_img in $(docker images --format "{{.Repository}} {{.Tag}}" | sed -n '/^dockcheck/p'); do
+    repo_name=${backup_img% *}
+    backup_tag=${backup_img#* }
+    backup_date=${backup_tag%%_*}
+    # UNTAGGING HERE
+    if datecheck "$backup_date" "$BackupForDays"; then
+      [[ "$CleanupCount" == 0 ]] && echo "Removing backed up images older then $BackupForDays days."
+      docker rmi "${repo_name}:${backup_tag}" && ((CleanupCount+=1))
+    fi
+  done
+  unset IFS
+  if [[ "$CleanupCount" == 0 ]]; then
+    printf "\nNo backup images to remove.\n"
+  else
+    printf "\n%b%s%b backup removed.%b\n" "$c_green" "$CleanupCount" "$c_teal" "$c_reset"
+  fi
+fi
+
 exit 0