summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-10-01 18:49:34 +0200
committermakefu <github@syntax-fehler.de>2015-10-01 18:49:34 +0200
commit49c00cf74f778152f4aed943dedb7bbf283b16e7 (patch)
tree29946a2fedb005b68a417acf3ac04d6f858f8aa1 /Makefile
parent73aa31010415ac5f7bf86d2bb77099fc3097905a (diff)
parent4af4fa89e50c3769d9331608cec2e6752ceb4fcb (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile15
1 files changed, 10 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 3727793e8..552e6e0fd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,8 @@
#
# usage:
-# make system=foo
-# make systems='foo bar'
+# make infest system=foo [target=bar]
+# make [deploy] system=foo [target=bar]
+# make [deploy] systems='foo bar'
# make eval get=tv.wu.config.time.timeZone [filter=json]
#
@@ -11,6 +12,7 @@
ifdef systems
$(systems):
@
+ unset target
parallel \
--line-buffer \
-j0 \
@@ -20,7 +22,7 @@ $(systems):
else ifdef system
.PHONY: deploy infest
deploy infest:;@
- export get=$$LOGNAME.${system}.config.krebs.build.scripts.$@
+ export get=krebs.$@
export filter=json
make -s eval | sh
@@ -39,8 +41,11 @@ endif
--eval \
-A "$$get" \
'<stockholm>' \
- --argstr user-name "$$LOGNAME" \
- --argstr host-name "$$HOSTNAME" \
+ --argstr current-date "$$(date -Is)" \
+ --argstr current-host-name "$$HOSTNAME" \
+ --argstr current-user-name "$$LOGNAME" \
+ $${system+--argstr system "$$system"} \
+ $${target+--argstr target "$$target"} \
| filter
else
$(error unbound variable: system[s])