Merge pull request #466 from github/gamefiend-fix-pruning

Fix pruning snapshots during backup.

Author: chuckp22

share/github-backup-utils/ghe-backup-config

@@ -191,31 +191,6 @@ PATH="$GHE_BACKUP_ROOT/bin:$GHE_BACKUP_ROOT/share/github-backup-utils:$PATH"
 # backup.config value when set.
 GHE_HOSTNAME_PRESERVE="$GHE_HOSTNAME"
 
-# Source in the backup config file from the copy specified in the environment
-# first and then fall back to the backup-utils root, home directory and system.
-config_found=false
-for f in "$GHE_BACKUP_CONFIG" "$GHE_BACKUP_ROOT/backup.config" \
-  "$HOME/.github-backup-utils/backup.config" "/etc/github-backup-utils/backup.config"; do
-  if [ -f "$f" ]; then
-    GHE_BACKUP_CONFIG="$f"
-    # shellcheck disable=SC1090 # This is a user-supplied value that can't be predicted
-    . "$GHE_BACKUP_CONFIG"
-    config_found=true
-    break
-  fi
-done
-
-# If we don't have a readlink command, error out
-! type readlink 1>/dev/null 2>&1 && {
-    echo "Error: readlink not found. Please install readlink and ensure it is in your PATH." 1>&2
-    exit 1
-}
-
-GHE_RESTORE_IN_PROGRESS=$(readlink -fm "${GHE_DATA_DIR}/in-progress-restore")
-GHE_BACKUP_IN_PROGRESS=$(readlink -fm "${GHE_DATA_DIR}/in-progress-backup")
-
-export GHE_RESTORE_IN_PROGRESS
-export GHE_BACKUP_IN_PROGRESS
 
 ghe_restore_check() {
   if [ -h "$GHE_RESTORE_IN_PROGRESS" ]; then

share/github-backup-utils/ghe-prune-snapshots

@@ -17,9 +17,20 @@ prune_snapshot() {
   # ignore any directory that is included in inc_full_backup or inc_snapshot_data
   # the files should be filtered out earlier, but this is a safeguard to make sure.
   # inc_previous_* and prune_inc_previous are ignored by default
-  if grep -q "$prune_dir" "$GHE_DATA_DIR/inc_full_backup" || grep "$prune_dir" "$GHE_DATA_DIR/inc_snapshot_data"; then
-    continue
+  if [ -f "$GHE_DATA_DIR/inc_full_backup" ]; then
+    if grep -q "$prune_dir" "$GHE_DATA_DIR"/inc_full_backup; then
+      log_info "Skipping incremental backup directory: $prune_dir" 1>&3
+      continue
+    fi
+  fi
+
+  if [ -f "$GHE_DATA_DIR/inc_snapshot_data" ]; then
+    if grep -q "$prune_dir" "$GHE_DATA_DIR"/inc_snapshot_data; then
+      log_info "Skipping incremental backup directory: $prune_dir" 1>&3
+      continue
+    fi
   fi
+  
   # skip if the directory is not a directory or blank
   if [ ! -d "$prune_dir" ] || [ -z "$prune_dir" ]; then
     log_info "Skipping blank or non-directory: $prune_dir" 1>&3