From 4e07d2a9090bf2c995ec16c07a418a35509e895d Mon Sep 17 00:00:00 2001
From: deadc0de6 <info@deadc0de.ch>
Date: Thu, 21 Sep 2023 15:01:16 +0200
Subject: [PATCH] backup tests

---
 dotdrop/installer.py |  2 ++
 dotdrop/utils.py     |  2 ++
 tests-ng/backup.sh   | 30 ------------------------------
 3 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/dotdrop/installer.py b/dotdrop/installer.py
index 5e60900..f333782 100644
--- a/dotdrop/installer.py
+++ b/dotdrop/installer.py
@@ -477,6 +477,8 @@ class Installer:
                 return False, 'aborted'
 
             # remove symlink
+            if self.backup and not os.path.isdir(dst):
+                self._backup(dst)
             overwrite = True
             try:
                 removepath(dst)
diff --git a/dotdrop/utils.py b/dotdrop/utils.py
index 564e937..cd8baf2 100644
--- a/dotdrop/utils.py
+++ b/dotdrop/utils.py
@@ -175,6 +175,8 @@ def removepath(path, logger=None):
             return
         LOG.err(err)
         raise OSError(err)
+    if logger:
+        logger.dbg(f'removing {path}')
     try:
         if os.path.islink(path) or os.path.isfile(path):
             os.unlink(path)
diff --git a/tests-ng/backup.sh b/tests-ng/backup.sh
index eb2d34e..3e2e110 100755
--- a/tests-ng/backup.sh
+++ b/tests-ng/backup.sh
@@ -151,7 +151,6 @@ grep_or_fail original "${tmpd}"/tree/file.dotdropbak
 grep_or_fail original "${tmpd}"/tree/template.dotdropbak
 grep_or_fail original "${tmpd}"/tree/sub/file.dotdropbak
 grep_or_fail original "${tmpd}"/tree/sub/template.dotdropbak
-grep_or_fail original "${tmpd}"/file.dotdropbak
 grep_or_fail p1 "${tmpd}"/template
 grep_or_fail modified "${tmpd}"/dir/sub
 grep_or_fail p1 "${tmpd}"/dir/template
@@ -167,28 +166,13 @@ clear_dotpath
 clear_fs
 create_dotpath
 create_fs
-tree "${tmps}"/dotfiles
-tree "${tmpd}"
 cd "${ddpath}" | ${bin} install -f -c "${cfg}" -p p1 --verbose
 
 # checks
 [ ! -e "${tmpd}"/file.dotdropbak ] && echo "${pre} file backup not found" && exit 1
 [ ! -e "${tmpd}"/template.dotdropbak ] && echo "${pre} template backup not found" && exit 1
-[ ! -e "${tmpd}"/dir/sub.dotdropbak ] && echo "${pre} dir sub backup not found" && exit 1
-[ ! -e "${tmpd}"/dir/template.dotdropbak ] && echo "${pre} dir template backup not found" && exit 1
-[ ! -e "${tmpd}"/tree/file.dotdropbak ] && echo "${pre} tree file backup not found" && exit 1
-[ ! -e "${tmpd}"/tree/template.dotdropbak ] && echo "${pre} tree template backup not found" && exit 1
-[ ! -e "${tmpd}"/tree/sub/file.dotdropbak ] && echo "${pre} tree sub file backup not found" && exit 1
-[ ! -e "${tmpd}"/tree/sub/template.dotdropbak ] && echo "${pre} tree sub template backup not found" && exit 1
 grep_or_fail original "${tmpd}"/file.dotdropbak
 grep_or_fail original "${tmpd}"/template.dotdropbak
-grep_or_fail original "${tmpd}"/dir/sub.dotdropbak
-grep_or_fail original "${tmpd}"/dir/template.dotdropbak
-grep_or_fail original "${tmpd}"/tree/file.dotdropbak
-grep_or_fail original "${tmpd}"/tree/template.dotdropbak
-grep_or_fail original "${tmpd}"/tree/sub/file.dotdropbak
-grep_or_fail original "${tmpd}"/tree/sub/template.dotdropbak
-grep_or_fail original "${tmpd}"/file.dotdropbak
 grep_or_fail p1 "${tmpd}"/template
 grep_or_fail modified "${tmpd}"/dir/sub
 grep_or_fail p1 "${tmpd}"/dir/template
@@ -209,21 +193,8 @@ cd "${ddpath}" | ${bin} install -f -c "${cfg}" -p p1 --verbose
 # checks
 [ ! -e "${tmpd}"/file.dotdropbak ] && echo "${pre} file backup not found" && exit 1
 [ ! -e "${tmpd}"/template.dotdropbak ] && echo "${pre} template backup not found" && exit 1
-[ ! -e "${tmpd}"/dir/sub.dotdropbak ] && echo "${pre} dir sub backup not found" && exit 1
-[ ! -e "${tmpd}"/dir/template.dotdropbak ] && echo "${pre} dir template backup not found" && exit 1
-[ ! -e "${tmpd}"/tree/file.dotdropbak ] && echo "${pre} tree file backup not found" && exit 1
-[ ! -e "${tmpd}"/tree/template.dotdropbak ] && echo "${pre} tree template backup not found" && exit 1
-[ ! -e "${tmpd}"/tree/sub/file.dotdropbak ] && echo "${pre} tree sub file backup not found" && exit 1
-[ ! -e "${tmpd}"/tree/sub/template.dotdropbak ] && echo "${pre} tree sub template backup not found" && exit 1
 grep_or_fail original "${tmpd}"/file.dotdropbak
 grep_or_fail original "${tmpd}"/template.dotdropbak
-grep_or_fail original "${tmpd}"/dir/sub.dotdropbak
-grep_or_fail original "${tmpd}"/dir/template.dotdropbak
-grep_or_fail original "${tmpd}"/tree/file.dotdropbak
-grep_or_fail original "${tmpd}"/tree/template.dotdropbak
-grep_or_fail original "${tmpd}"/tree/sub/file.dotdropbak
-grep_or_fail original "${tmpd}"/tree/sub/template.dotdropbak
-grep_or_fail original "${tmpd}"/file.dotdropbak
 grep_or_fail p1 "${tmpd}"/template
 grep_or_fail modified "${tmpd}"/dir/sub
 grep_or_fail p1 "${tmpd}"/dir/template
@@ -258,7 +229,6 @@ grep_or_fail original "${tmpd}"/tree/file.dotdropbak
 grep_or_fail original "${tmpd}"/tree/template.dotdropbak
 grep_or_fail original "${tmpd}"/tree/sub/file.dotdropbak
 grep_or_fail original "${tmpd}"/tree/sub/template.dotdropbak
-grep_or_fail original "${tmpd}"/file.dotdropbak
 grep_or_fail p1 "${tmpd}"/template
 grep_or_fail modified "${tmpd}"/dir/sub
 grep_or_fail p1 "${tmpd}"/dir/template