Erik Flodin
8e5d4b1578
Pass classes as separate arguments to template_default
...
To work around problem with passing newlines in variable with awk on
darwin. This fixes #437 .
2024-11-08 19:54:14 +01:00
Erik Flodin
d74a41b1b4
Merge pull request #497 from erijo/template-default
...
Rewrite default template to handle nested ifs, != and env vars in if
2024-11-06 22:25:40 +01:00
Erik Flodin
8ba9823407
Rewrite default template to handle nested ifs, != and env vars in if
...
The awk script now performs all processing in the BEGIN block using an
implementation that is capable of handling if statements which contain nested
if statments (fixes #436 ). To make nested ifs look better, if, else and endif
lines can now have optional whitespace before {%.
Includes are now handled in the same way as the main file which means that
included files can both include other files and have if statements in addition
to variables (fixes #406 ). Include lines can now also have optional whitespace
before {%.
All variables are handled in the same way now so it's now possible to use env
variables in if statements (fixes #488 ).
Also add support for != in addition to == (fixes #358 ). Thus it's now
e.g. possible to check if a variable is set (#477 ) by doing:
{% if yadm.class != ""%}
Class is set to {{ yadm.class }}
{% endif %}
A non-existing yadm or env variable is now replaced with the empty string.
2024-11-04 22:30:23 +01:00
Tim Byrne
76ce3defea
Changes for black compliance
2023-07-12 09:20:00 -05:00
Tim Byrne
e704175201
Add black to linting
2023-07-12 09:20:00 -05:00
Tim Byrne
1b36bf2bb6
Move all test/linting configs into pyproject.toml
...
Except for flake8 which doesn't support pyproject.toml yet.
2023-07-12 09:19:59 -05:00
Tim Byrne
7af2af52ae
Lint using isort
2023-07-12 09:19:59 -05:00
Tim Byrne
bbc1ca17f0
Changes for new flake8 compliance
2023-07-12 09:19:59 -05:00
Tim Byrne
8a87f4a30f
Changes for new pylint compliance
2023-07-12 09:19:59 -05:00
Tim Byrne
f9e0368385
Changes for new shellcheck compliance
2023-07-12 09:19:59 -05:00
Tim Byrne
c8acf77e04
Adjust pinentry mock
...
The new test Docker image has a newer gnupg which does not behave the
same way, handling invalid passwords. This type of error is simulated
using an ICP error in the pinentry protocol.
2023-07-12 09:19:59 -05:00
Tim Byrne
9752d801ae
Replace deprecated "pipes" with "shlex"
2023-07-12 09:19:58 -05:00
Tim Byrne
84437894b5
Use man.REAL
2023-07-12 09:19:58 -05:00
Tim Byrne
82ba16db34
Support testing with newer version of Git
2023-07-12 09:19:58 -05:00
Tim Byrne
2253e52ab7
Update test Docker image
...
* Update base image (which uses a newer python)
* Update linters
* Update other dependencies
2023-07-12 09:19:53 -05:00
Tim Byrne
e4bb8a79a4
Update to shields.io new API
2023-01-23 13:51:06 -06:00
Tim Byrne
2d4dcd05ef
Update version number and update documentation
...
* Support spaces in distro/distro-family (#432 )
* Fix zsh hanging when tab completing add/checkout (#417 )
* Add yadm-untracked script to contributed files (#418 )
* Fix documentation typos (#425 )
* Support docker-like OCI engines for dev testing (#431 )
2023-01-23 13:25:54 -06:00
Tim Byrne
5981f6329e
Adjust markdown creation for new version of groff
2023-01-23 13:16:53 -06:00
Tim Byrne
0f8538d3e3
Create tests for underscores in distro/family
2022-09-13 12:38:18 -05:00
Tim Byrne
67c684473d
Merge pull request #432 from signed-log/alt_with_spaces
2022-09-13 11:56:51 -05:00
Nicolas signed-log FORMICHELLA
8f390cf085
Accept _ as space substitutes
...
Replace all spaces in the ID/ID_LIKE scoring to allow for space
replacement
Signed-off-by: Nicolas signed-log FORMICHELLA <stigpro@outlook.fr>
2022-08-28 18:29:41 +02:00
Tim Byrne
36fda72bec
Remove superfluous space
2022-08-27 13:55:24 -05:00
Tim Byrne
a89e5cee89
Merge pull request #431 from signed-log/makefile-oci-patch
2022-08-27 13:45:53 -05:00
Nicolas signed-log FORMICHELLA
075cd1b06b
[Documentation] Document OCI switch
...
Document the OCI override switch
Signed-off-by: Nicolas signed-log FORMICHELLA <stigpro@outlook.fr>
2022-08-27 11:55:54 +02:00
Nicolas signed-log FORMICHELLA
19b7a30668
[Makefile] Support docker-like OCI engines
...
Support setting a different OCI engine than docker
- Create OCI variable to override the docker engine
- Refactor the test-docker error message to expose this possibility
Signed-off-by: Nicolas signed-log FORMICHELLA <stigpro@outlook.fr>
2022-08-27 11:39:22 +02:00
Tim Byrne
6304553ab3
Merge pull request #425 from rasa/patch-1
2022-07-13 00:03:46 -05:00
Ross Smith II
24ee841372
docs: Fix cypher typo
2022-07-08 17:08:51 -07:00
Ross Smith II
87ff97bbd6
docs: Fix cypher typo
2022-07-08 17:06:30 -07:00
Tim Byrne
f163130609
Remove trailing whitespace
2022-07-08 08:12:08 -05:00
Tim Byrne
d49005ce6c
Merge branch 'joshzcold-master' into develop
...
I've signed these commits myself.
2022-07-08 08:11:30 -05:00
Joshua Cold
2cc64a2fa0
remove extra lines
2022-07-08 08:09:38 -05:00
Joshua Cold
2989734359
Add back in the descriptions
2022-07-08 08:09:33 -05:00
Joshua Cold
7573e18a89
Fix duplicates from completion
2022-07-08 08:09:27 -05:00
Joshua Cold
beb83077d8
Fix zsh hanging when tab completing add/checkout
2022-07-08 08:08:58 -05:00
Tim Byrne
6a49e849c8
Remove trailing space
2022-06-03 15:49:14 -05:00
Tim Byrne
222182b296
Add README for contrib/commands
2022-06-03 15:49:05 -05:00
Tim Byrne
0d67c44343
Merge pull request #418 from gwww/master
2022-06-03 15:47:43 -05:00
Glenn Waters
a9e7e7679b
Add yadm-untracked script.
2022-06-03 15:36:50 -05:00
Tim Byrne
abf6ea4b61
Update version number and update documentation
...
* Fix Bash 3 bad array subscript bug (#411 )
2022-03-17 18:47:43 -05:00
Tim Byrne
f59d903769
Fix Bash 3 bad array subscript bug ( #411 )
2022-03-17 18:43:10 -05:00
Tim Byrne
bd0039a650
Release 3.2.0
2022-03-16 10:22:30 -05:00
Tim Byrne
82c0b6d02e
Update version number and update documentation
...
* Support architecture for alternates/templates (#202 , #203 , #393 )
* Support distro_family for alternates/templates (#213 )
* Support setting multiple classes (#185 , #304 )
* Support environment variables in default template processor (#347 )
* Update version command to include Bash & Git versions (#377 )
2022-03-16 09:26:11 -05:00
Tim Byrne
a4adadcc8c
Fix table format
2022-03-12 15:11:55 -06:00
Tim Byrne
287249df91
Clarify requirements for linked directories ( #328 )
2022-03-12 15:04:47 -06:00
Tim Byrne
c5e4e4eda2
Adjust exempt labels
2022-03-12 11:36:26 -06:00
Tim Byrne
46f72c2768
Add local.arch to config introspection
2022-02-21 14:09:57 -06:00
Tim Byrne
ebb6715aad
Reduce supported labels for architecture
2022-02-21 14:01:08 -06:00
Tim Byrne
39d0c791ce
Reorder list
2022-02-21 13:18:48 -06:00
Tim Byrne
3445763731
Add manpage docs about env support in default templates
2022-02-21 12:42:45 -06:00
Tim Byrne
718e99c826
Add manpage documentation for multiple classes
2022-02-21 11:36:51 -06:00
