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

change precedence of uservariables

Browse Source
This commit is contained in:
deadc0de6
2021-09-23 21:05:51 +02:00
parent dcdc10d314
commit 64eb15f97e
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dotdrop/cfg_yaml.py
View File

@@ -169,7 +169,7 @@ class CfgYaml:
# parse the "uservariables" block # parse the "uservariables" block
uvariables = self._parse_blk_uservariables(self._yaml_dict) uvariables = self._parse_blk_uservariables(self._yaml_dict)
self._add_variables(uvariables, template=False, prio=True) self._add_variables(uvariables, template=False, prio=False)
# now template variables and dynvariables from the same pool # now template variables and dynvariables from the same pool
self._rec_resolve_variables(self.variables) self._rec_resolve_variables(self.variables)

14
tests-ng/uservariables.sh
View File

@@ -62,14 +62,14 @@ config:
create: true create: true
dotpath: dotfiles dotpath: dotfiles
variables: variables:
var1: abc var4: "variables_var4"
var2: def
dynvariables: dynvariables:
var1: "echo ghi" var3: "echo dynvariables_var3"
var2: "echo jkl"
uservariables: uservariables:
var1: "var1" var1: "var1"
var2: "var2" var2: "var2"
var3: "var3"
var4: "var4"
dotfiles: dotfiles:
f_abc: f_abc:
dst: ${tmpd}/abc dst: ${tmpd}/abc
@@ -84,14 +84,18 @@ _EOF
# create the dotfile # create the dotfile
echo "var1: {{@@ var1 @@}}" > ${tmps}/dotfiles/abc echo "var1: {{@@ var1 @@}}" > ${tmps}/dotfiles/abc
echo "var2: {{@@ var2 @@}}" >> ${tmps}/dotfiles/abc echo "var2: {{@@ var2 @@}}" >> ${tmps}/dotfiles/abc
echo "var3: {{@@ var3 @@}}" >> ${tmps}/dotfiles/abc
echo "var4: {{@@ var4 @@}}" >> ${tmps}/dotfiles/abc
# install # install
cd ${ddpath} | echo -e 'var1contentxxx\nvar2contentyyy\n' | ${bin} install -f -c ${cfg} -p p1 -V cd ${ddpath} | echo -e 'var1contentxxx\nvar2contentyyy\nvar3\nvar4\n' | ${bin} install -f -c ${cfg} -p p1 -V
cat ${tmpd}/abc cat ${tmpd}/abc
grep '^var1: var1contentxxx$' ${tmpd}/abc >/dev/null grep '^var1: var1contentxxx$' ${tmpd}/abc >/dev/null
grep '^var2: var2contentyyy$' ${tmpd}/abc >/dev/null grep '^var2: var2contentyyy$' ${tmpd}/abc >/dev/null
grep '^var3: dynvariables_var3$' ${tmpd}/abc >/dev/null
grep '^var4: variables_var4$' ${tmpd}/abc >/dev/null
## CLEANING ## CLEANING
rm -rf ${tmps} ${tmpd} ${scr} rm -rf ${tmps} ${tmpd} ${scr}