blob: 6929faa8ea0b0f9051aefcea081a130a663ace7a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
|
#!/bin/bash
# this script was downloaded from:
# https://jeroen.a-eskwadraat.nl/sw/annotate
# and is part of devscripts ###VERSION###
# Executes a program annotating the output linewise with time and stream
# Version 1.2
# Copyright 2003, 2004 Jeroen van Wolffelaar <jeroen@wolffelaar.nl>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
progname=$(basename $0)
addtime ()
{
while IFS= read -r line; do
printf "%s %s: %s\n" "$(date "${FMT}")" "$1" "$line"
done
if [ ! -z "$line" ]; then
printf "%s %s: %s" "$(date "${FMT}")" "$1" "$line"
fi
}
addprefix ()
{
while IFS= read -r line; do
printf "%s: %s\n" "$1" "$line"
done
if [ ! -z "$line" ]; then
printf "%s: %s" "$1" "$line"
fi
}
usage ()
{
echo \
"Usage: $progname [options] program [args ...]
Run program and annotate STDOUT/STDERR with a timestamp.
Options:
+FORMAT - Controls the timestamp format as per date(1)
-h, --help - Show this message"
}
FMT="+%H:%M:%S"
while [ "$1" ]; do
case "$1" in
+*)
FMT="$1"
shift
;;
-h|-help|--help)
usage
exit 0
;;
*)
break
;;
esac
done
if [ $# -lt 1 ]; then
usage
exit 1
fi
cleanup() { __st=$?; rm -rf "$tmp"; exit $__st; }
trap cleanup 0
trap 'exit $?' 1 2 13 15
tmp=$(mktemp -d --tmpdir annotate.XXXXXX) || exit 1
OUT=$tmp/out
ERR=$tmp/err
mkfifo $OUT $ERR || exit 1
if [ "${FMT/\%}" != "${FMT}" ] ; then
addtime O < $OUT &
addtime E < $ERR &
else
# If FMT does not contain a %, use the optimized version that
# does not call 'date'.
addprefix "${FMT#+} O" < $OUT &
addprefix "${FMT#+} E" < $ERR &
fi
echo "Started $@" | addtime I
"$@" > $OUT 2> $ERR ; EXIT=$?
rm -f $OUT $ERR
wait
echo "Finished with exitcode $EXIT" | addtime I
exit $EXIT
|
