From ae791c363c58c5d88936372fadf8e80c132cfea1 Mon Sep 17 00:00:00 2001 From: Devaev Maxim Date: Fri, 28 Jun 2019 20:29:16 +0300 Subject: refactoring --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index a35118ac..3dd4917a 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ all: testenv: - docker build $(if $(NC), --no-cache,) --rm --tag $(TESTENV_IMAGE) -f testenv/Dockerfile . + docker build $(if $(NC),--no-cache,) --rm --tag $(TESTENV_IMAGE) -f testenv/Dockerfile . tox: testenv @@ -43,7 +43,7 @@ tox: testenv && cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \ && cp /src/testenv/main.yaml /etc/kvmd \ && cd /src \ - && tox -c testenv/tox.ini $(if $(E), -e $(E), -p auto) \ + && tox -c testenv/tox.ini $(if $(E),-e $(E),-p auto) \ " @@ -69,7 +69,7 @@ run: testenv && ln -s $(TESTENV_VIDEO) /dev/kvmd-video \ && (losetup -d /dev/kvmd-msd || true) \ && losetup /dev/kvmd-msd /root/loop.img \ - && $(if $(CMD), $(CMD), python -m kvmd.apps.kvmd) \ + && $(if $(CMD),$(CMD),python -m kvmd.apps.kvmd) \ " - docker run --rm --device=$(TESTENV_LOOP):/dev/kvmd-msd -it $(TESTENV_IMAGE) losetup -d /dev/kvmd-msd @@ -85,7 +85,7 @@ run-ipmi: testenv cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \ && cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \ && cp /testenv/main.yaml /etc/kvmd \ - && $(if $(CMD), $(CMD), python -m kvmd.apps.ipmi) \ + && $(if $(CMD),$(CMD),python -m kvmd.apps.ipmi) \ " @@ -108,7 +108,7 @@ release: bump: - bumpversion $(if $(V), $(V), minor) + bumpversion $(if $(V),$(V),minor) push: -- cgit v1.2.3