psi-jack
/
yadm
mirror of
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #254 from erijo/misc

This commit is contained in:
Tim Byrne 2020-10-10 17:53:30 -05:00
parent e0daf86334 b55ad5b525
commit 90901e588e
No known key found for this signature in database
GPG Key ID: 14DB4FC2465A4B12
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -93,7 +93,7 @@ test:
cd /yadm && \ cd /yadm && \
py.test -v $(testargs); \ py.test -v $(testargs); \
else \ else \
if command -v "docker-compose" &> /dev/null; then \ if command -v "docker-compose" > /dev/null 2>&1; then \
docker-compose run --rm testbed make test testargs="$(testargs)"; \ docker-compose run --rm testbed make test testargs="$(testargs)"; \
else \ else \
echo "Sorry, this make test requires docker-compose to be installed."; \ echo "Sorry, this make test requires docker-compose to be installed."; \
@ -102,8 +102,8 @@ test:
fi fi
.PHONY: testhost .PHONY: testhost
testhost: version ?= HEAD
testhost: require-docker testhost: require-docker
@version=HEAD
@rm -rf /tmp/testhost @rm -rf /tmp/testhost
@git show $(version):yadm > /tmp/testhost @git show $(version):yadm > /tmp/testhost
@chmod a+x /tmp/testhost @chmod a+x /tmp/testhost
@ -117,8 +117,8 @@ testhost: require-docker
bash -l bash -l
.PHONY: scripthost .PHONY: scripthost
scripthost: version ?= HEAD
scripthost: require-docker scripthost: require-docker
@version=HEAD
@rm -rf /tmp/testhost @rm -rf /tmp/testhost
@git show $(version):yadm > /tmp/testhost @git show $(version):yadm > /tmp/testhost
@chmod a+x /tmp/testhost @chmod a+x /tmp/testhost
@ -197,7 +197,7 @@ sync-clock:
.PHONY: require-docker .PHONY: require-docker
require-docker: require-docker:
@if ! command -v "docker" &> /dev/null; then \ @if ! command -v "docker" > /dev/null 2>&1; then \
echo "Sorry, this make target requires docker to be installed."; \ echo "Sorry, this make target requires docker to be installed."; \
false; \ false; \
fi fi

2
yadm.1
View File

@ -704,7 +704,7 @@ Examples:
.I whatever##template .I whatever##template
with the following content with the following content
{% if yadm.user == 'harvey' %} {% if yadm.user == "harvey" %}
config={{yadm.class}}-{{yadm.os}} config={{yadm.class}}-{{yadm.os}}
{% else %} {% else %}
config=dev-whatever config=dev-whatever