josch/mmdebstrap
2
3
Fork 6
Code Issues 8 Pull requests 1 Projects Releases Wiki Activity

make_mirror.sh: instead of prefixing with the current time, print the timedelta since script start

Browse source
This commit is contained in:
Johannes 'josch' Schauer 2019-03-01 12:44:31 +01:00
parent b7f7f4e581
commit aa319c64b2
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
make_mirror.sh
View file

@ -285,7 +285,7 @@ systemctl restart mini-httpd
handler () { handler () {
while IFS= read -r line || [ -n "$line" ]; do while IFS= read -r line || [ -n "$line" ]; do
printf "%s %s: %s\n" "$(date +%T.%3N)" "$1" "$line" printf "%s %s: %s\n" "$(date -u -d "0 $(date +%s.%3N) seconds - $2 seconds" +"%T.%3N")" "$1" "$line"
done done
} }
@ -296,11 +296,12 @@ handler () {
mount -o loop,umask=000 cover_db.img cover_db mount -o loop,umask=000 cover_db.img cover_db
fi fi
now=$(date +%s.%3N)
ret=0 ret=0
{ { { { { { { { { {
sh -x ./test.sh 2>&1 1>&4 3>&- 4>&-; echo $? >&2; sh -x ./test.sh 2>&1 1>&4 3>&- 4>&-; echo $? >&2;
} | handler E >&3; } | handler E "$now" >&3;
} 4>&1 | handler O >&3; } 4>&1 | handler O "$now" >&3;
} 2>&1; } 2>&1;
} | { read xs; exit $xs; }; } | { read xs; exit $xs; };
} 3>&1 || ret=$? } 3>&1 || ret=$?