retracediff: More helpful error message when glretrace is not found.

[apitrace] / scripts / tracediff.sh

diff --git a/scripts/tracediff.sh b/scripts/tracediff.sh
index 01f383403c7af1999e820d1bb15037522d8cc6a2..4449d758ebdc62a0ceebccf1fa2d8f081ff8c123 100755 (executable)
--- a/scripts/tracediff.sh
+++ b/scripts/tracediff.sh
@@ -26,15 +26,13 @@
 
 set -e
 
-TRACEDUMP=${TRACEDUMP:-`dirname "$0"`/tracedump}
+TRACEDUMP=${TRACEDUMP:-`dirname "$0"`/../tracedump}
 
 $TRACEDUMP
 
 stripdump () {
-    # http://www.theeggeadventure.com/wikimedia/index.php/Linux_Tips#Use_sed_to_remove_ANSI_colors
-    $TRACEDUMP "$1" \
+    $TRACEDUMP --no-color "$1" \
     | sed \
-        -e 's/\x1b\[[0-9]\{1,2\}\(;[0-9]\{1,2\}\)\{0,2\}m//g' \
         -e 's/\r$//g' \
         -e 's/^[0-9]\+ //' \
         -e 's/hdc = \w\+/hdc/g' \
@@ -52,6 +50,10 @@ mkfifo "$FIFO2"
 stripdump "$1" "$FIFO1" &
 stripdump "$2" "$FIFO2" &
 
-sdiff --width=`tput cols` --speed-large-files "$FIFO1" "$FIFO2" | less -R
+sdiff \
+    --width=`tput cols` \
+    --speed-large-files \
+    "$FIFO1" "$FIFO2" \
+| less -R
 
 rm -rf "$FIFODIR"