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

adding pre-defined variables for #105

Browse Source
This commit is contained in:
deadc0de6
2019-03-22 08:54:07 +01:00
parent 0bfcb28f99
commit 395ef0d1d2
2 changed files with 109 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
dotdrop/config.py
View File

@@ -203,6 +203,16 @@ class Cfg:
# ensures it's an empty list
v[self.key_profiles_dots] = []
# make sure we have an absolute dotpath
self.curdotpath = self.lnk_settings[self.key_dotpath]
self.lnk_settings[self.key_dotpath] = \
self._abs_path(self.curdotpath)
# make sure we have an absolute workdir
self.curworkdir = self.lnk_settings[self.key_workdir]
self.lnk_settings[self.key_workdir] = \
self._abs_path(self.curworkdir)
# load external variables/dynvariables
if self.key_include_vars in self.lnk_settings:
paths = self.lnk_settings[self.key_include_vars]
@@ -379,17 +389,6 @@ class Cfg:
for k in self.lnk_profiles.keys():
df = ','.join([d.key for d in self.prodots[k]])
self.log.dbg('dotfiles for \"{}\": {}'.format(k, df))
# make sure we have an absolute dotpath
self.curdotpath = self.lnk_settings[self.key_dotpath]
self.lnk_settings[self.key_dotpath] = \
self._abs_path(self.curdotpath)
# make sure we have an absolute workdir
self.curworkdir = self.lnk_settings[self.key_workdir]
self.lnk_settings[self.key_workdir] = \
self._abs_path(self.curworkdir)
return True
def _load_ext_variables(self, paths, profile=None):
@@ -769,6 +768,11 @@ class Cfg:
if profile:
variables['profile'] = profile
# add paths variables
variables['_dotdrop_dotpath'] = self.lnk_settings[self.key_dotpath]
variables['_dotdrop_cfgpath'] = self.cfgpath
variables['_dotdrop_workdir'] = self.lnk_settings[self.key_workdir]
# global variables
if self.key_variables in self.content:
variables.update(self.content[self.key_variables])