From aaa4152fac0e807fb8ce12aa73cd1b058e4a3766 Mon Sep 17 00:00:00 2001 From: Tim Byrne Date: Thu, 30 Mar 2017 21:58:26 -0500 Subject: [PATCH] Remove trailing whitespace --- test/113_accept_jinja_alt.bats | 2 +- yadm | 2 +- yadm.1 | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/113_accept_jinja_alt.bats b/test/113_accept_jinja_alt.bats index ec1d440..7d889df 100644 --- a/test/113_accept_jinja_alt.bats +++ b/test/113_accept_jinja_alt.bats @@ -101,7 +101,7 @@ function test_alt() { and auto-alt is configured true and file matches ##yadm_tmpl automatically process alternates - report no linking (not loud) + report no linking (not loud) Verify that the correct content is written " diff --git a/yadm b/yadm index aa31dd8..0730292 100755 --- a/yadm +++ b/yadm @@ -199,7 +199,7 @@ function alt() { #; for every file which is a *##yadm_tmpl create a real file local IFS=$'\n' local match="^(.+)##yadm_tmpl" - local envtpl_bin=$(which envtpl) + local envtpl_bin=$(which envtpl) 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 76f4f24..73e0fc8 100644 --- a/yadm.1 +++ b/yadm.1 @@ -91,8 +91,8 @@ Instead use the command (see below). .TP .B alt -Create symbolic links and process jinja templates for any managed files matching the naming rules describe -in the ALTERNATES section. +Create symbolic links and process jinja templates for any managed files matching the naming rules describe +in the ALTERNATES section. It is usually unnecessary to run this command, as .B yadm automatically processes alternates by default. @@ -401,7 +401,7 @@ can detect files with names ending in any of the following: If there are any files managed by .BR yadm \'s repository, -or listed in +or listed in .IR $HOME/.yadm/encrypt , which match this naming convention, symbolic links will be created for the most appropriate version. @@ -490,19 +490,19 @@ using the configuration options and .BR local.user . -If +If .BR envtpl ( .BR pip\ install\ envtpl -) is available, you can also create +) is available, you can also create .B jinja -templates (http://jinja.pocoo.org/) which will transformed into real files. +templates (http://jinja.pocoo.org/) which will transformed into real files. .B yadm -will treat files ending in +will treat files ending in ##yadm_tmpl -as jinja templates. During processing, the following variables are +as jinja templates. During processing, the following variables are set according to the above rules: YADM_CLASS