run.sh: sync up with model-checker improvements

diff --git a/run.sh b/run.sh
index a14aea3bf3635ceee7ae8a81ae9b5442f4e2a39f..7f554e7bb4b29e0c47fcc2e7003ce2022fb66dfe 100755 (executable)
--- a/run.sh
+++ b/run.sh
@@ -11,15 +11,18 @@
 # default program.
 #
 
-BIN=./barrier/barrier
+# Get the directory in which this script is located
+BINDIR="${0%/*}"
+
+BIN=${BINDIR}/barrier/barrier
 PREFIX=
 
-export LD_LIBRARY_PATH=..
+export LD_LIBRARY_PATH=${BINDIR}/..
 # For Mac OSX
-export DYLD_LIBRARY_PATH=..
+export DYLD_LIBRARY_PATH=${BINDIR}/..
 
 [ $# -gt 0 ] && [ "$1" = "gdb" ] && PREFIX=gdb && shift
-[ $# -gt 0 ] && [ -x "$1" ] && [ -f "$1" ] && BIN="$1" && shift
+[ $# -gt 0 ] && [ -e "$1" ] && BIN="$1" && shift
 
-set -x
+set -xe
 $PREFIX $BIN $@