mirrors/dotdrop
1
0
Fork 0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-04 19:09:44 +00:00
Code Activity

Merge pull request #37 from ziirish/issue-36

Browse Source 
better handle directory updates (fix #36)
This commit is contained in:
deadc0de
2018-06-01 14:28:29 +02:00
committed by GitHub
parent 018cfd6fe2 6a49b31d35
commit 1694ed247a
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dotdrop/dotdrop.py
View File

@@ -197,10 +197,15 @@ def update(opts, conf, path):
return False
dotfile = subs[0]
src = os.path.join(conf.get_abs_dotpath(opts['dotpath']), dotfile.src)
if Templategen.get_marker() in open(src, 'r').read():
if os.path.isfile(src) and \
Templategen.get_marker() in open(src, 'r').read():
LOG.warn('\"{}\" uses template, please update manually'.format(src))
return False
cmd = ['cp', '-R', '-L', os.path.expanduser(path), src]
# Handle directory update
src_clean = src
if os.path.isdir(src):
src_clean = os.path.join(src, '..')
cmd = ['cp', '-R', '-L', os.path.expanduser(path), src_clean]
if opts['dry']:
LOG.dry('would run: {}'.format(' '.join(cmd)))
else: