chore: gitignore

Author: cschweda

.gitignore

@@ -43,6 +43,7 @@ secrets.sh
 *_credentials.json
 .api_keys
 .secrets/
+.env
 
 # Credentials and secrets
 .secrets.checksum

backup.sh

@@ -4,13 +4,11 @@
 
 # Source the shared modules
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-# Use absolute paths to be certain
-source "/home/cschw/backup-webdev/src/core/config.sh"
-source "/home/cschw/backup-webdev/src/utils/utils.sh"
-source "/home/cschw/backup-webdev/src/ui/ui.sh" 
-source "/home/cschw/backup-webdev/src/core/fs.sh"
-source "/home/cschw/backup-webdev/src/reports/reporting.sh"
+source "$SCRIPT_DIR/config.sh"
+source "$SCRIPT_DIR/utils.sh"
+source "$SCRIPT_DIR/ui.sh"
+source "$SCRIPT_DIR/fs.sh"
+source "$SCRIPT_DIR/reporting.sh"
 
 # Default values
 SILENT_MODE=false
@@ -28,9 +26,6 @@ CUSTOM_SOURCE_DIRS=()
 DRY_RUN=false
 EXTERNAL_BACKUP=false  # Track if this is an external (cloud) backup
 
-# Set BACKUP_DIR from DEFAULT_BACKUP_DIR (from config.sh)
-BACKUP_DIR="$DEFAULT_BACKUP_DIR"
-
 # Parse command line arguments
 while [[ $# -gt 0 ]]; do
     case $1 in
@@ -164,11 +159,6 @@ fi
 # For backward compatibility
 SOURCE_DIR="${SOURCE_DIRS[0]}"
 
-# Set backup directory if custom was provided
-if [ -n "$CUSTOM_BACKUP_DIR" ]; then
-    BACKUP_DIR="$CUSTOM_BACKUP_DIR"
-fi
-
 # Verify source directories exist
 for dir in "${SOURCE_DIRS[@]}"; do
     if [[ ! -d "$dir" ]]; then

check-config.sh

@@ -4,16 +4,8 @@
 
 # Get the script's directory
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# Set constants for colors first
-CYAN="\033[0;36m"
-GREEN="\033[0;32m"
-YELLOW="\033[0;33m"
-RED="\033[0;31m"
-NC="\033[0m" # No Color
-
-# Source paths with absolute paths to be sure
-source "/home/cschw/backup-webdev/src/core/config.sh"
-source "/home/cschw/backup-webdev/src/utils/utils.sh"
+source "$SCRIPT_DIR/config.sh"
+source "$SCRIPT_DIR/utils.sh"
 
 # Check for required utilities
 echo -e "${CYAN}===== WebDev Backup Tool Configuration Check =====${NC}"

cleanup.sh

@@ -4,10 +4,10 @@
 
 # Source the shared modules
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "$SCRIPT_DIR/../core/config.sh"
-source "$SCRIPT_DIR/../utils/utils.sh"
-source "$SCRIPT_DIR/../ui/ui.sh"
-source "$SCRIPT_DIR/../core/fs.sh"
+source "$SCRIPT_DIR/config.sh"
+source "$SCRIPT_DIR/utils.sh"
+source "$SCRIPT_DIR/ui.sh"
+source "$SCRIPT_DIR/fs.sh"
 
 # Log cleaning options
 LOGS_BACKUP=false

config.sh

@@ -0,0 +1,66 @@
+#!/bin/bash
+# config.sh - Configuration file for WebDev Backup Tool
+
+# Get the script's directory
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+# Default source directories - define as array
+DEFAULT_SOURCE_DIRS=()
+
+# Check for ~/webdev directory and add it if exists
+if [ -d "$HOME/webdev" ]; then
+    DEFAULT_SOURCE_DIRS+=("$HOME/webdev")
+fi
+
+# Check for ~/inform6 directory and add it if exists
+if [ -d "$HOME/inform6" ]; then
+    DEFAULT_SOURCE_DIRS+=("$HOME/inform6")
+fi
+
+# If no default directories found, try to use parent directory of script
+if [ ${#DEFAULT_SOURCE_DIRS[@]} -eq 0 ]; then
+    # Try to use parent directory of script location
+    parent_dir="$(dirname "$SCRIPT_DIR")"
+    if [ -d "$parent_dir" ] && [ -r "$parent_dir" ]; then
+        DEFAULT_SOURCE_DIRS+=("$parent_dir")
+    else
+        # Fallback to script directory itself
+        DEFAULT_SOURCE_DIRS+=("$SCRIPT_DIR")
+    fi
+fi
+
+# For backward compatibility - first directory is the default
+DEFAULT_SOURCE_DIR="${DEFAULT_SOURCE_DIRS[0]}"
+
+# Default backup destination - pick a reliable location
+DEFAULT_BACKUP_DIR="/mnt/d/backups"
+if [ ! -d "$DEFAULT_BACKUP_DIR" ] || [ ! -w "$DEFAULT_BACKUP_DIR" ]; then
+    # Fallback to script directory if default isn't accessible
+    DEFAULT_BACKUP_DIR="$SCRIPT_DIR/backups"
+    # Create it if it doesn't exist
+    [ ! -d "$DEFAULT_BACKUP_DIR" ] && mkdir -p "$DEFAULT_BACKUP_DIR"
+fi
+
+# Default cloud provider
+DEFAULT_CLOUD_PROVIDER="do"
+
+# Log and test directories
+LOGS_DIR="$SCRIPT_DIR/logs"
+TEST_DIR="$SCRIPT_DIR/test"
+mkdir -p "$LOGS_DIR" "$TEST_DIR"
+
+# Date format for backup directories and logs
+DATE_FORMAT="%Y-%m-%d_%H-%M-%S"
+DATE=$(date +$DATE_FORMAT)
+
+# Backup naming convention
+BACKUP_PREFIX="webdev_backup"
+
+# Log files
+BACKUP_HISTORY_LOG="$LOGS_DIR/backup_history.log"
+TEST_HISTORY_LOG="$TEST_DIR/test_history.log"
+
+# Export variables for use in other scripts
+export SCRIPT_DIR DEFAULT_SOURCE_DIRS DEFAULT_SOURCE_DIR DEFAULT_BACKUP_DIR DEFAULT_CLOUD_PROVIDER
+export LOGS_DIR TEST_DIR DATE_FORMAT DATE BACKUP_PREFIX
+export BACKUP_HISTORY_LOG TEST_HISTORY_LOG

dirs-status.sh

@@ -3,8 +3,8 @@
 
 # Source the shared modules
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "$SCRIPT_DIR/../core/config.sh"
-source "$SCRIPT_DIR/../utils/utils.sh"
+source "$SCRIPT_DIR/config.sh"
+source "$SCRIPT_DIR/utils.sh"
 
 # Header
 echo -e "${CYAN}===== WebDev Backup Tool - Source Directories Report =====${NC}"