summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-09-27 19:41:01 +0200
committermakefu <github@syntax-fehler.de>2015-09-27 19:41:01 +0200
commitbc2bd6e2f6e9295b14e641b82bff62b40641988d (patch)
tree8bc4b655c12b4e0bc33051116a3adb3003463d34 /Makefile
parentc65614cdef66c38ff2939928e9072873e19e1c37 (diff)
parent170191034e51fb7e80ff6e6ddcac103ec7527afd (diff)
Merge branch 'before-merge'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile19
1 files changed, 9 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index b34278ced..3727793e8 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
# usage:
# make system=foo
# make systems='foo bar'
-# make eval system=foo get=config.networking.extraHosts [filter=json]
+# make eval get=tv.wu.config.time.timeZone [filter=json]
#
.ONESHELL:
@@ -10,20 +10,19 @@
ifdef systems
$(systems):
+ @
parallel \
--line-buffer \
-j0 \
--no-notice \
--tagstring {} \
- -q make systems= system={} ::: $(systems)
+ -q make -s systems= system={} ::: $(systems)
else ifdef system
-.PHONY: deploy
-deploy:;@
- make eval system=$(system) get=config.krebs.build.script filter=json | sh
-
-.PHONY: infest
-infest:;@
- make eval system=$(system) get=config.krebs.build.infest filter=json | sh
+.PHONY: deploy infest
+deploy infest:;@
+ export get=$$LOGNAME.${system}.config.krebs.build.scripts.$@
+ export filter=json
+ make -s eval | sh
.PHONY: eval
eval:
@@ -41,7 +40,7 @@ endif
-A "$$get" \
'<stockholm>' \
--argstr user-name "$$LOGNAME" \
- --argstr system-name "$$system" \
+ --argstr host-name "$$HOSTNAME" \
| filter
else
$(error unbound variable: system[s])