1
0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-09 03:39:15 +00:00

Moving execution of dynamic variables and merging of dynvariables/variables after the include loop in _rec_resolve_profile_include

This commit is contained in:
Davide Laezza
2020-07-05 20:22:52 +02:00
parent 8bfdfa2826
commit fb69e154c4
2 changed files with 34 additions and 18 deletions

View File

@@ -117,14 +117,13 @@ echo "{{@@ maindyn @@}}" >> ${tmps}/dotfiles/abc
echo "{{@@ subdyn @@}}" >> ${tmps}/dotfiles/abc
echo "{{@@ subvar @@}}" >> ${tmps}/dotfiles/abc
echo "end" >> ${tmps}/dotfiles/abc
cat ${tmps}/dotfiles/abc
#cat ${tmps}/dotfiles/abc
# install
cd ${ddpath} | ${bin} install -f -c ${cfg} -p profile_1 --verbose
# check dotfile exists
[ ! -e ${tmpd}/abc ] && exit 1
cat ${tmpd}/abc
grep 'maincontent' ${tmpd}/abc >/dev/null || (echo "variables 1 not resolved" && exit 1)
grep 'maindyncontent' ${tmpd}/abc >/dev/null || (echo "dynvariables 1 not resolved" && exit 1)
grep 'subcontent' ${tmpd}/abc >/dev/null || (echo "variables 2 not resolved" && exit 1)