diff options
| author | makefu <github@syntax-fehler.de> | 2016-05-24 22:12:38 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-05-24 22:12:38 +0200 |
| commit | 9cba0ffefa95079168f3419cf11eb98400a468db (patch) | |
| tree | f483f11d62ced67b06e017a65417135b9ba8a2ce /Makefile | |
| parent | 4de1c87ff62dadc4cbe812a48d10241d79aca183 (diff) | |
| parent | c44e649455f3c162b66fb9d2d678a7a0eeff598b (diff) | |
merge cd/master
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -9,6 +9,7 @@ export STOCKHOLM_VERSION ?= $(shell \ printf '%s' "$$date.$$version"; \ ) +system ?= $(HOSTNAME) $(if $(system),,$(error unbound variable: system)) nixos-config ?= $(stockholm)/$(LOGNAME)/1systems/$(system).nix @@ -54,15 +55,17 @@ evaluate = \ --show-trace \ -I nixos-config=$(nixos-config) \ -I stockholm=$(stockholm) \ - -E '{ eval, f }: f eval' \ - --arg eval 'import ./.' \ - --arg f "eval@{ config, ... }: $(1)" + -E "let eval = import <stockholm>; in with eval; $(1)" execute = \ result=$$($(call evaluate,config.krebs.build.$(1))) && \ script=$$(echo "$$result" | jq -r .) && \ echo "$$script" | PS5=% sh +ifeq ($(MAKECMDGOALS),) +$(error No goals specified) +endif + # usage: make deploy system=foo [target_host=bar] deploy: ssh ?= ssh deploy: @@ -73,7 +76,7 @@ deploy: # usage: make LOGNAME=shared system=wolf eval.config.krebs.build.host.name eval eval.:;@$(call evaluate,$${expr-eval}) -eval.%:;@$(call evaluate,$*) +eval.%:;@$(call evaluate,$@) # usage: make install system=foo [target_host=bar] install: ssh ?= ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null |