Chris@274: #!/bin/bash -x Chris@269: p=`dirname $0` Chris@210: if [ $# -lt 2 ]; then Chris@210: echo Insufficient arguments: $@ Chris@210: exit 2 Chris@210: fi Chris@210: while [ $# -gt 2 ]; do Chris@210: shift Chris@210: done Chris@269: found="" Chris@269: for d in kdiff3 kdiff3.exe; do Chris@269: if [ -x "$p/$d" ]; then Chris@269: found=true Chris@269: "$p/$d" "$1" "$2" Chris@269: break Chris@274: elif [ -x "$(type -path $d)" ]; then Chris@274: found=true Chris@274: "$d" "$1" "$2" Chris@274: break; Chris@269: fi Chris@269: done Chris@269: if [ -z "$found" ]; then Chris@269: od=/usr/bin/opendiff Chris@269: if [ -x "$od" ]; then Chris@274: found=true Chris@269: "$od" "$1" "$2" | cat Chris@269: fi Chris@269: fi Chris@292: [ -n "$found" ] Chris@274: