From 972005c82a6b97c4552a5c7d8b249806c26c6a0e Mon Sep 17 00:00:00 2001
From: jaydee <jaydee@sectorq.eu>
Date: Fri, 10 Jan 2025 22:11:29 +0100
Subject: [PATCH] lala

---
 omv_backup_v2.py | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/omv_backup_v2.py b/omv_backup_v2.py
index 3720ca6..64ce7a5 100644
--- a/omv_backup_v2.py
+++ b/omv_backup_v2.py
@@ -334,15 +334,15 @@ if _BACKUP:
                     BACKUP_HOST = backups[host]["login"]
                     BACKUP_DEVICE = "/srv/dev-disk-by-uuid-2f843500-95b6-43b0-bea1-9b67032989b8"
                     BACKUP_DIR = f"{BACKUP_HOST}:{SOURCE_DIR}"
-                    
+                    BACKUP_ROOT = f"{BACKUP_DEVICE}/backup/{host}/{b}"
                     DATETIME = now.strftime("%Y-%m-%d_%H-%M-%S")
                     
                     if _FIRST:
-                        NEW_BACKUP_DIR = f"{BACKUP_DEVICE}/backup/{host}/{b}/initial"
+                        NEW_BACKUP_DIR = f"{BACKUP_ROOT}/initial"
                     else:
-                        NEW_BACKUP_DIR = f"{BACKUP_DEVICE}/backup/{host}/{b}/{DATETIME}"
+                        NEW_BACKUP_DIR = f"{BACKUP_ROOT}/{DATETIME}"
   
-                    FULL_BACKUP_LATEST = f"{BACKUP_DEVICE}/backup/{host}/{b}/latest"
+                    FULL_BACKUP_LATEST = f"{BACKUP_ROOT}/latest"
 
 
                     msg = {"status":"started","bak_name":b,"start_time":DATETIME,"end_time":"in progress", "progress":0}
@@ -369,8 +369,7 @@ if _BACKUP:
                     print("Sync files")
                     input("??????")
                     if _TEST:
-                        
-                        
+  
                         ans = input("continue?") or "n"
                     if ans == "y" and _EXECUTE:
 
@@ -381,17 +380,17 @@ if _BACKUP:
 
                         status, output = subprocess.getstatusoutput(cmnd)
                     
-                    cmnd = f"ssh root@omv.home.lan 'rm -rf {FULL_BACKUP_LATEST}'"
+                    cmnd = f"rm -rf {FULL_BACKUP_LATEST}"
                     
-                    #print(cmnd)
+                    print(cmnd)
                     print("Removing latest link")
                 #    input("????")
                     if _EXECUTE:
                         status, output = subprocess.getstatusoutput(cmnd)
                     if _FIRST:
-                        cmnd = f"ssh root@omv.home.lan 'cd {NEW_BACKUP_DIR}; ln -s initial latest'"
+                        cmnd = f"cd {NEW_BACKUP_DIR}; ln -s initial latest"
                     else:
-                        cmnd = f"ssh root@omv.home.lan 'cd {NEW_BACKUP_DIR}; ln -s {DATETIME} latest'"
+                        cmnd = f"cd {NEW_BACKUP_DIR}; ln -s {DATETIME} latest"
                     print("Creating new latest link")
                     #print(cmnd)
                 #    input("????")
@@ -403,7 +402,7 @@ if _BACKUP:
                     print("Removing old dirs")
                 #    input("????")
                     #cmnd = "find {} -maxdepth 1 -type d -mtime +30 -exec rm -rf {{}} \;".format(BACKUP_DIR)
-                    cmnd = f"cd {NEW_BACKUP_DIR} find ./ -maxdepth 1 -type d -mmin +30 -exec rm -rf {{}} \\;"
+                    cmnd = f"cd {BACKUP_ROOT} find ./ -maxdepth 1 -type d -mmin +30 -exec rm -rf {{}} \\;"
                     #print(cmnd)
                 #   input("????")
                     if _EXECUTE: