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

Update where args parsed to conform to upstream

Browse Source
This commit is contained in:
Marcel Robitaille
2019-01-28 18:44:28 -04:00
parent 5aa7ac5878
commit 881071ff45
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dotdrop/dotdrop.py
View File

@@ -264,11 +264,6 @@ def cmd_importer(opts, conf, paths):
linktype = LinkTypes(opts['link']) linktype = LinkTypes(opts['link'])
if opts['link_by_default'] and linktype == LinkTypes.PARENTS:
linktype = LinkTypes.NOLINK
else:
linktype = LinkTypes.PARENTS
if opts['debug']: if opts['debug']:
LOG.dbg('new dotfile: {}'.format(dotfile)) LOG.dbg('new dotfile: {}'.format(dotfile))
@@ -443,9 +438,16 @@ def main():
opts['profile'] = args['--profile'] opts['profile'] = args['--profile']
opts['safe'] = not args['--force'] opts['safe'] = not args['--force']
opts['installdiff'] = not args['--nodiff'] opts['installdiff'] = not args['--nodiff']
opts['link'] = opts['link_by_default'] opts['link'] = LinkTypes.NOLINK
if args['--inv-link']: if opts['link_by_default']:
opts['link'] = not opts['link'] opts['link'] = LinkTypes.PARENTS
# Only invert link type from NOLINK to PARENTS and vice-versa
if args['--inv-link'] and opts['link'] == LinkTypes.NOLINK:
opts['link'] = LinkTypes.PARENTS
if args['--inv-link'] and opts['link'] == LinkTypes.PARENTS:
opts['link'] = LinkTypes.NOLINK
opts['debug'] = args['--verbose'] opts['debug'] = args['--verbose']
opts['variables'] = conf.get_variables(opts['profile']) opts['variables'] = conf.get_variables(opts['profile'])
opts['showdiff'] = opts['showdiff'] or args['--showdiff'] opts['showdiff'] = opts['showdiff'] or args['--showdiff']