From 99df5644235e2afd2e29fa895e037c910521fd61 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Thu, 9 Jul 2015 19:01:35 -0600
Subject: wip

---
 wrapper/inner.sh.m4 | 12 +++++++-----
 wrapper/runcmd.mk   |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'wrapper')

diff --git a/wrapper/inner.sh.m4 b/wrapper/inner.sh.m4
index 047b8f1..bd7a643 100644
--- a/wrapper/inner.sh.m4
+++ b/wrapper/inner.sh.m4
@@ -78,9 +78,10 @@ _runcmd() {
 	fi
 	files=("${files[@]#"${exec_path/modules/}"}")
 
-	local output_dir
-	trap '[ -z "${output_dir:-}" ] || rm -rf -- "$TMPDIR"' EXIT
-	output_dir="$(mktemp -dt "${PACKAGE}.XXXXXXXXXX")"
+	local tmpdir
+	trap '[ -z "${tmpdir:-}" ] || rm -rf -- "$tmpdir"' EXIT
+	tmpdir="$(mktemp -dt "${PACKAGE}.XXXXXXXXXX")"
+	mkdir -- "$tmpdir/output"
 
 	local repo
 	repo="$(_repo)"
@@ -91,10 +92,11 @@ _runcmd() {
 
 	make -j1 \
 	     -f "$exec_path/runcmd.mk" \
-	     -C "$output_dir" \
+	     -C "$tmpdir/output" \
+	     CWD="$cwd" \
 	     ARGS="$args_str" \
 	     EXEC_PATH="$exec_path" \
-	     CWD="$cwd" \
+	     TMPDIR="$tmpdir" \
 	     -- "${files[@]}"
 	exit $?
 }
diff --git a/wrapper/runcmd.mk b/wrapper/runcmd.mk
index 7cadb43..7340d11 100644
--- a/wrapper/runcmd.mk
+++ b/wrapper/runcmd.mk
@@ -10,6 +10,6 @@ SHELL = bash -o pipefail
 export OUTPUT_DIR := $(realpath .)
 
 % : $(EXEC_PATH)/modules/%
-        cd $(CWD) && '$<' $(ARGS) | tee -- '$@'
+        cd $(CWD) && '$<' $(ARGS) | tee -- '$@' | sed 's,^,$@:,' >/dev/tty
 
 include $(wildcard $(EXEC_PATH)/modules/*.mk)
-- 
cgit v1.2.3-2-g168b