From bd631d7cad6844ea16114271fdb50e865808e506 Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Mon, 15 Feb 2016 16:31:38 +0100
Subject: [PATCH] [util-iso-log] prepare to use lib

---
 lib/util-iso-log.sh | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/lib/util-iso-log.sh b/lib/util-iso-log.sh
index 9d95264..b199c68 100644
--- a/lib/util-iso-log.sh
+++ b/lib/util-iso-log.sh
@@ -21,6 +21,19 @@ error_function() {
 	exit 2
 }
 
+# $1: function
+run_log(){
+	local logfile=${iso_dir}/$(gen_iso_fn).log shellopts=$(shopt -p)
+	logpipe=$(mktemp -u "/tmp/logpipe.XXXXXXXX")
+	mkfifo "$logpipe"
+	tee "$logfile" < "$logpipe" &
+	local teepid=$!
+	$1 &> "$logpipe"
+	wait $teepid
+	rm "$logpipe"
+	eval "$shellopts"
+}
+
 run_safe() {
 	local restoretrap
 	set -e
@@ -32,15 +45,3 @@ run_safe() {
 	set +E
 	set +e
 }
-
-# $1: function
-run_log(){
-	local logfile=${work_dir}/${imgname}.log
-	logpipe=$(mktemp -u "/tmp/logpipe.XXXXXXXX")
-	mkfifo "$logpipe"
-	tee "$logfile" < "$logpipe" &
-	local teepid=$!
-	$1 &> "$logpipe"
-	wait $teepid
-	rm "$logpipe"
-}