diff options
| author | tv <tv@krebsco.de> | 2015-09-27 00:22:50 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2015-09-27 00:37:20 +0200 |
| commit | 5353e6c05a47820bd970f0c7fd00ef87f7d30425 (patch) | |
| tree | ca9b48481d0555bcf00657a2bb217a94ee6ae4f4 /Makefile | |
| parent | ac49a8c7b826225b6d374f46dae9096c649e0e01 (diff) | |
krebs.build: merge deploy and infest
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 19 |
1 files changed, 9 insertions, 10 deletions
@@ -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 -s eval system=$(system) get=config.krebs.build.script filter=json | sh - -.PHONY: infest -infest:;@ - make -s 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]) |