1
0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-04 17:24:46 +00:00
This commit is contained in:
deadc0de6
2023-12-22 10:39:09 +01:00
committed by deadc0de
parent a61bd34799
commit 223d9d2880
3 changed files with 5 additions and 13 deletions

View File

@@ -186,6 +186,7 @@ class Options(AttrMonitor):
self._set_attr_err = True self._set_attr_err = True
def debug_command(self): def debug_command(self):
"""print the original command"""
self.log.dbg(f'command: {self.argv}') self.log.dbg(f'command: {self.argv}')
@classmethod @classmethod

View File

@@ -350,8 +350,8 @@ class Updater:
compare=False) compare=False)
def _merge_files_copy_left_only(self, diff, left, right, def _merge_files_copy_left_only(self, diff, left, right,
ignore_missing_in_dotdrop, ignore_missing_in_dotdrop,
ignores): ignores):
"""copy files that don't exist in dotdrop""" """copy files that don't exist in dotdrop"""
self.log.dbg(f'_merge_dirs_copy_left_only: {diff.left_only}') self.log.dbg(f'_merge_dirs_copy_left_only: {diff.left_only}')
for toadd in diff.left_only: for toadd in diff.left_only:
@@ -413,8 +413,8 @@ class Updater:
ignores) ignores)
# files # files
self._merge_files_copy_left_only(diff, left, right, self._merge_files_copy_left_only(diff, left, right,
ignore_missing_in_dotdrop, ignore_missing_in_dotdrop,
ignores) ignores)
self._merge_files_remove_right_only(diff, right, ignores) self._merge_files_remove_right_only(diff, right, ignores)
# compare rights # compare rights

View File

@@ -26,15 +26,6 @@ echo -e "$(tput setaf 6)==> RUNNING $(basename "${BASH_SOURCE[0]}") <==$(tput sg
################################################################ ################################################################
# this is the test # this is the test
################################################################ ################################################################
# $1 pattern
# $2 path
grep_or_fail()
{
if ! grep "${1}" "${2}" >/dev/null 2>&1; then
echo "${PRE} pattern \"${1}\" not found in ${2}"
exit 1
fi
}
# the dotfile source # the dotfile source
tmps=$(mktemp -d --suffix='-dotdrop-tests' || mktemp -d) tmps=$(mktemp -d --suffix='-dotdrop-tests' || mktemp -d)