From f6580a65e86d6ff3af93ceb647c49897f0b0f590 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Sun, 8 Dec 2019 22:14:30 +0100 Subject: [PATCH] Simplify (and maybe correct) script. --- tools/fix-paje-trace.sh | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/tools/fix-paje-trace.sh b/tools/fix-paje-trace.sh index a8e9325978..96b2bb1a87 100755 --- a/tools/fix-paje-trace.sh +++ b/tools/fix-paje-trace.sh @@ -13,24 +13,22 @@ fi TRACE=$1 echo "input: $TRACE" -OUTPUT=$( echo $TRACE | cut -d\. -f1 ).fix.trace +OUTPUT=${TRACE%.*}.fix.trace -grep ^% < $TRACE > header -DEFEVENTS=$(grep Define < header | awk '{ print $3 }') +grep ^% -- "$TRACE" > header +DEFEVENTS=( $(awk '/Define/ { print $3 }' header) ) -GREP="" -GREP2="" -for i in $DEFEVENTS +GREP=() +for i in "${DEFEVENTS[@]}" do - GREP="/^$i /d; $GREP" - GREP2="-e '^$i ' $GREP2" + GREP+=( -e "^$i " ) done -GREP="/^%\ /d; /^% /d; /^%E/d; $GREP" +GREP2=( -e $'^%[ \tE]' "${GREP[@]}" ) -grep $GREP2 < $TRACE > types -/bin/sed -e "$GREP" $TRACE > events +grep "${GREP[@]}" -- "$TRACE" > types +grep -v "${GREP2[@]}" -- "$TRACE" > events sort -n -k 2 -s < events > events.sorted -cat header types events.sorted > $OUTPUT -rm types events events.sorted header +cat header types events.sorted > "$OUTPUT" +rm -f types events events.sorted header echo "output: $OUTPUT" -- 2.20.1