annotate easyhg-extdiff.sh @ 274:24820581e532

* Use kdiff3 from path if present; return sensible return code
author Chris Cannam
date Thu, 10 Feb 2011 18:49:01 +0000
parents f6b71fda5957
children a1c8630a0057
rev   line source
Chris@274 1 #!/bin/bash -x
Chris@269 2 p=`dirname $0`
Chris@210 3 if [ $# -lt 2 ]; then
Chris@210 4 echo Insufficient arguments: $@
Chris@210 5 exit 2
Chris@210 6 fi
Chris@210 7 while [ $# -gt 2 ]; do
Chris@210 8 shift
Chris@210 9 done
Chris@269 10 found=""
Chris@269 11 for d in kdiff3 kdiff3.exe; do
Chris@269 12 if [ -x "$p/$d" ]; then
Chris@269 13 found=true
Chris@269 14 "$p/$d" "$1" "$2"
Chris@269 15 break
Chris@274 16 elif [ -x "$(type -path $d)" ]; then
Chris@274 17 found=true
Chris@274 18 "$d" "$1" "$2"
Chris@274 19 break;
Chris@269 20 fi
Chris@269 21 done
Chris@269 22 if [ -z "$found" ]; then
Chris@269 23 od=/usr/bin/opendiff
Chris@269 24 if [ -x "$od" ]; then
Chris@274 25 found=true
Chris@269 26 "$od" "$1" "$2" | cat
Chris@269 27 fi
Chris@269 28 fi
Chris@274 29 [ -z "$found" ]
Chris@274 30