diff --git a/test/113_accept_jinja_alt.bats b/test/113_accept_jinja_alt.bats index 7d7e259..0847ea9 100644 --- a/test/113_accept_jinja_alt.bats +++ b/test/113_accept_jinja_alt.bats @@ -86,7 +86,7 @@ function test_alt() { @test "Command 'alt' (envtpl missing)" { echo " When the command 'alt' is provided - and file matches ##yadm_tmpl + and file matches ##yadm.j2 Report jinja template as unprocessed Exit with 0 " @@ -110,7 +110,7 @@ function test_alt() { @test "Command 'alt' (select jinja)" { echo " When the command 'alt' is provided - and file matches ##yadm_tmpl + and file matches ##yadm.j2 Report jinja template processing Verify that the correct content is written Exit with 0 @@ -123,7 +123,7 @@ function test_alt() { echo " When a command possibly changes the repo and auto-alt is configured true - and file matches ##yadm_tmpl + and file matches ##yadm.j2 automatically process alternates report no linking (not loud) Verify that the correct content is written @@ -136,7 +136,7 @@ function test_alt() { echo " When a command possibly changes the repo and auto-alt is configured false - and file matches ##yadm_tmpl + and file matches ##yadm.j2 Report no jinja template processing Verify no content " @@ -147,7 +147,7 @@ function test_alt() { @test "Command 'alt' (overwrite existing content)" { echo " When the command 'alt' is provided - and file matches ##yadm_tmpl + and file matches ##yadm.j2 and the real file exists, and is wrong Report jinja template processing Verify that the correct content is written @@ -160,7 +160,7 @@ function test_alt() { @test "Command 'alt' (overwritten settings)" { echo " When the command 'alt' is provided - and file matches ##yadm_tmpl + and file matches ##yadm.j2 after setting local.* Report jinja template processing Verify that the correct content is written diff --git a/test/common.bash b/test/common.bash index c3360ee..5670ed0 100644 --- a/test/common.bash +++ b/test/common.bash @@ -202,7 +202,7 @@ function create_worktree() { make_parents "$DIR_WORKTREE/$f" echo "$f" > "$DIR_WORKTREE/$f" done - echo "{{ YADM_CLASS }}-{{ YADM_OS }}-{{ YADM_HOSTNAME }}-{{ YADM_USER }}" > "$DIR_WORKTREE/alt-jinja##yadm_tmpl" + echo "{{ YADM_CLASS }}-{{ YADM_OS }}-{{ YADM_HOSTNAME }}-{{ YADM_USER }}" > "$DIR_WORKTREE/alt-jinja##yadm.j2" fi diff --git a/yadm b/yadm index 07652d0..76a6e44 100755 --- a/yadm +++ b/yadm @@ -197,9 +197,9 @@ function alt() { done #; loop over all "tracked" files - #; for every file which is a *##yadm_tmpl create a real file + #; for every file which is a *##yadm.j2 create a real file local IFS=$'\n' - local match="^(.+)##yadm_tmpl$" + local match="^(.+)##yadm\\.j2$" for tracked_file in $("$GIT_PROGRAM" ls-files | sort) $(cat "$YADM_ENCRYPT" 2>/dev/null); do tracked_file="$YADM_WORK/$tracked_file" if [ -e "$tracked_file" ] ; then diff --git a/yadm.1 b/yadm.1 index cc0c432..1aa8ff1 100644 --- a/yadm.1 +++ b/yadm.1 @@ -502,7 +502,7 @@ templates will also be processed to create or overwrite real files. .B yadm will treat files ending in - ##yadm_tmpl + ##yadm.j2 as Jinja templates. During processing, the following variables are set according to the rules explained in the ALTERNATES section: @@ -513,7 +513,7 @@ according to the rules explained in the ALTERNATES section: YADM_USER For example, a file named -.I whatever##yadm_tmpl +.I whatever##yadm.j2 with the following content {% if YADM_USER == 'harvey' -%}