psi-jack/yadm
1
0
Fork 0
mirror of synced 2024-12-22 06:31:07 -05:00
Code Issues Releases Wiki Activity

Remove trailing whitespace

Browse source
This commit is contained in:
Tim Byrne 2017-03-30 21:58:26 -05:00
parent 5f47794104
commit aaa4152fac
No known key found for this signature in database
GPG key ID: 14DB4FC2465A4B12
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/113_accept_jinja_alt.bats
View file

@ -101,7 +101,7 @@ function test_alt() {
and auto-alt is configured true and auto-alt is configured true
and file matches ##yadm_tmpl and file matches ##yadm_tmpl
automatically process alternates automatically process alternates
report no linking (not loud) report no linking (not loud)
Verify that the correct content is written Verify that the correct content is written
" "

2
yadm
View file

@ -199,7 +199,7 @@ function alt() {
#; for every file which is a *##yadm_tmpl create a real file #; for every file which is a *##yadm_tmpl create a real file
local IFS=$'\n' local IFS=$'\n'
local match="^(.+)##yadm_tmpl" 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 for tracked_file in $("$GIT_PROGRAM" ls-files | sort) $(cat "$YADM_ENCRYPT" 2>/dev/null); do
tracked_file="$YADM_WORK/$tracked_file" tracked_file="$YADM_WORK/$tracked_file"
if [ -e "$tracked_file" ] ; then if [ -e "$tracked_file" ] ; then

16
yadm.1
View file

@ -91,8 +91,8 @@ Instead use the
command (see below). command (see below).
.TP .TP
.B alt .B alt
Create symbolic links and process jinja templates for any managed files matching the naming rules describe Create symbolic links and process jinja templates for any managed files matching the naming rules describe
in the ALTERNATES section. in the ALTERNATES section.
It is usually unnecessary to run this command, as It is usually unnecessary to run this command, as
.B yadm .B yadm
automatically processes alternates by default. 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 If there are any files managed by
.BR yadm \'s .BR yadm \'s
repository, repository,
or listed in or listed in
.IR $HOME/.yadm/encrypt , .IR $HOME/.yadm/encrypt ,
which match this naming convention, which match this naming convention,
symbolic links will be created for the most appropriate version. symbolic links will be created for the most appropriate version.
@ -490,19 +490,19 @@ using the configuration options
and and
.BR local.user . .BR local.user .
If If
.BR envtpl .BR envtpl
( (
.BR pip\ install\ envtpl .BR pip\ install\ envtpl
) is available, you can also create ) is available, you can also create
.B jinja .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 .B yadm
will treat files ending in will treat files ending in
##yadm_tmpl ##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: set according to the above rules:
YADM_CLASS YADM_CLASS