root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[util-iso-log] revert appending untilproperly working

Browse source
This commit is contained in:
udeved 2016-02-26 20:24:18 +01:00
parent 6d9d72c94d
commit 74d4ff8c0f
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/util-iso-log.sh
View file

@ -27,8 +27,7 @@ error_function() {
# $1: function # $1: function
run_log(){ run_log(){
local func="$1" name=$(gen_iso_fn) local func="$1" name=$(gen_iso_fn)
local tmpfile=/tmp/$name.$func.log logfile=${log_dir}/$name.log local tmpfile=/tmp/$name.$func.log logfile=${log_dir}/$name.$func.log
[[ -f $logfile ]] && rm $logfile
logpipe=$(mktemp -u "/tmp/logpipe.XXXXXXXX") logpipe=$(mktemp -u "/tmp/logpipe.XXXXXXXX")
mkfifo "$logpipe" mkfifo "$logpipe"
tee "$tmpfile" < "$logpipe" & tee "$tmpfile" < "$logpipe" &
@ -36,7 +35,7 @@ run_log(){
$func &> "$logpipe" $func &> "$logpipe"
wait $teepid wait $teepid
rm "$logpipe" rm "$logpipe"
cat $tmpfile | perl -pe 's/\e\[?.*?[\@-~]//g' >> $logfile cat $tmpfile | perl -pe 's/\e\[?.*?[\@-~]//g' > $logfile
rm "$tmpfile" rm "$tmpfile"
} }