From 64eb15f97e4e9d514962273a5a0b874a9bccd7f7 Mon Sep 17 00:00:00 2001
From: deadc0de6 <info@deadc0de.ch>
Date: Thu, 23 Sep 2021 21:05:51 +0200
Subject: [PATCH] change precedence of uservariables

---
 dotdrop/cfg_yaml.py       |  2 +-
 tests-ng/uservariables.sh | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/dotdrop/cfg_yaml.py b/dotdrop/cfg_yaml.py
index 273b492..e682792 100644
--- a/dotdrop/cfg_yaml.py
+++ b/dotdrop/cfg_yaml.py
@@ -169,7 +169,7 @@ class CfgYaml:
 
         # parse the "uservariables" block
         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
         self._rec_resolve_variables(self.variables)
diff --git a/tests-ng/uservariables.sh b/tests-ng/uservariables.sh
index 46321fe..cb7bf6b 100755
--- a/tests-ng/uservariables.sh
+++ b/tests-ng/uservariables.sh
@@ -62,14 +62,14 @@ config:
   create: true
   dotpath: dotfiles
 variables:
-  var1: abc
-  var2: def
+  var4: "variables_var4"
 dynvariables:
-  var1: "echo ghi"
-  var2: "echo jkl"
+  var3: "echo dynvariables_var3"
 uservariables:
   var1: "var1"
   var2: "var2"
+  var3: "var3"
+  var4: "var4"
 dotfiles:
   f_abc:
     dst: ${tmpd}/abc
@@ -84,14 +84,18 @@ _EOF
 # create the dotfile
 echo "var1: {{@@ var1 @@}}" > ${tmps}/dotfiles/abc
 echo "var2: {{@@ var2 @@}}" >> ${tmps}/dotfiles/abc
+echo "var3: {{@@ var3 @@}}" >> ${tmps}/dotfiles/abc
+echo "var4: {{@@ var4 @@}}" >> ${tmps}/dotfiles/abc
 
 # 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
 
 grep '^var1: var1contentxxx$' ${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
 rm -rf ${tmps} ${tmpd} ${scr}