From c539ae354ed75106a3230756ea9b4aab65209f59 Mon Sep 17 00:00:00 2001
From: Martin Otieno <martin@genius.ke>
Date: Sat, 8 Feb 2025 20:44:49 +0300
Subject: [PATCH] update dump procedure

---
 imageroot/bin/module-dump-state | 43 ---------------------------------
 1 file changed, 43 deletions(-)

diff --git a/imageroot/bin/module-dump-state b/imageroot/bin/module-dump-state
index 481f4d1..5989510 100755
--- a/imageroot/bin/module-dump-state
+++ b/imageroot/bin/module-dump-state
@@ -17,48 +17,6 @@ BACKUP_FILE="backup_paths.txt"
 BASE_DIR="/home/frappe/frappe-bench/sites/"
 
 backup_and_save_paths() {
-<<<<<<< HEAD
-    local site=$1
-    local output
-
-    echo "Listing apps"
-    podman exec backend bench list-apps
-    podman exec frontend bench list-apps
-    echo "Running this command"
-    echo "Running backup for site: $site"
-    output=$(podman exec backend bench --site "$site" backup --with-files 2>&1)
-    echo "Raw backup output: $output"
-
-    if [[ $? -ne 0 ]]; then
-        echo "Error during backup: $output"
-        exit 1
-    fi
-
-    echo "Backup output received."
-
-    # Use grep without lookbehind assertions
-    local config_path=$(echo "$output" | grep -o "Config\s*:\s*.*" | awk '{print $2}')
-    local db_path=$(echo "$output" | grep -o "Database:\s*.*" | awk '{print $2}')
-    local public_archive=$(echo "$output" | grep -o "Public\s*:\s*.*" | awk '{print $2}')
-    local private_archive=$(echo "$output" | grep -o "Private\s*:\s*.*" | awk '{print $2}')
-
-    # Validate that paths were extracted correctly
-    if [[ -z "$config_path" || -z "$db_path" || -z "$public_archive" || -z "$private_archive" ]]; then
-        echo "Error extracting backup paths."
-        exit 1
-    fi
-
-    # Save the paths to the backup file
-    {
-        echo "CONFIG_PATH=${BASE_DIR}${config_path}"
-        echo "DB_PATH=${BASE_DIR}${db_path}"
-        echo "PUBLIC_ARCHIVE=${BASE_DIR}${public_archive}"
-        echo "PRIVATE_ARCHIVE=${BASE_DIR}${private_archive}"
-    } >"$BACKUP_FILE"
-
-    echo "Backup paths saved to $BACKUP_FILE"
-}
-=======
 	local site=$1
 	local output
 
@@ -102,4 +60,3 @@ backup_and_save_paths() {
 echo "Starting Backup..."
 backup_and_save_paths "$SITE"
 echo "Backup finished."
->>>>>>> 47481e8f7811de507ae6abf4a39a62a98b19be0b