summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 958629055..e61d16b75 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,3 @@
-.ONESHELL:
-.SHELLFLAGS := -eufc
-
ifndef system
$(error unbound variable: system)
endif
@@ -17,12 +14,15 @@ evaluate = \
--show-trace \
$(1)
-execute = $(call evaluate,-A config.krebs.build.$(1) --json) | jq -r . | sh
+execute = \
+ result=$$($(call evaluate,-A config.krebs.build.$(1) --json)) && \
+ script=$$(echo "$$result" | jq -r .) && \
+ echo "$$script" | sh
# usage: make deploy system=foo [target_host=bar]
deploy:
$(call execute,populate)
- ssh "$$target_user@$$target_host" nixos-rebuild switch -I "$$target_path"
+ @set -x; ssh "$$target_user@$$target_host" nixos-rebuild switch -I "$$target_path"
# usage: make LOGNAME=shared system=wolf eval.config.krebs.build.host.name
eval eval.:;@$(call evaluate)
@@ -33,7 +33,7 @@ eval.%:;@$(call evaluate,-A $*)
#install: ssh = ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null
#install:;@set -x
# $(ssh) "$$target_user@$$target_host" \
-# env target_path=/var/src \
+# env target_path="$target_path" \
# sh -s prepare < krebs/4lib/infest/prepare.sh
# make -s populate target_path=/mnt"$$target_path"
# $(ssh) "$$target_user@$$target_host" \