X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=run%2Fdcpomatic_cli;h=b32462e59a090ba88754460b3323775423850149;hp=f2cacd7a22c9ddd8ac26ae7db6cdd0b17e07c5f5;hb=988e8d923fa30bca1be6ec78455324e1f2e62771;hpb=5797d31e6f9766c88f241a5c4cf4cd9709b36b0a

diff --git a/run/dcpomatic_cli b/run/dcpomatic_cli
index f2cacd7a2..b32462e59 100755
--- a/run/dcpomatic_cli
+++ b/run/dcpomatic_cli
@@ -1,18 +1,20 @@
 #!/bin/bash
 
-cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+source $DIR/environment
+
+binary=$DIR/../build/src/tools/dcpomatic2_cli
 
-export LD_LIBRARY_PATH=build/src/lib:build/src:/home/c.hetherington/lib:$LD_LIBRARY_PATH
 if [ "$1" == "--debug" ]; then
     shift
-    gdb --args build/src/tools/dcpomatic2_cli "$@"
+    gdb --args $binary "$@"
 elif [ "$1" == "--valgrind" ]; then
     shift
-    valgrind --tool="memcheck" --num-callers=24 --suppressions=suppressions build/src/tools/dcpomatic2_cli "$@"
-#    valgrind --tool="memcheck" --leak-check=full --show-reachable=yes --num-callers=24 --suppressions=suppressions build/src/tools/dcpomatic2_cli "$@"
+#    valgrind --tool="memcheck" --num-callers=24 --suppressions=suppressions build/src/tools/dcpomatic2_cli "$@"
+    valgrind --tool="memcheck" --leak-check=full --show-reachable=yes --num-callers=24 --suppressions=suppressions $binary "$@"
 elif [ "$1" == "--callgrind" ]; then
     shift
-    valgrind --tool="callgrind" build/src/tools/dcpomatic2_cli "$@"
+    valgrind --tool="callgrind" $binary "$@"
 else
-    build/src/tools/dcpomatic2_cli "$@"
+    $binary "$@"
 fi