diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-12 19:36:06 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-12 19:36:06 +0100 |
| commit | 459bf3a7fa408bc90eca9eeb7fcd2bbb774e0668 (patch) | |
| tree | f3693b02975a0ca0fc0da3d120d1adfedbd28ed7 | |
| parent | 26f2e20607096cd285110c8ced9e32beb837b55e (diff) | |
Fix scripts when run from other directories.
| -rwxr-xr-x | run/dcpomatic | 16 | ||||
| -rwxr-xr-x | run/dcpomatic_player | 16 |
2 files changed, 18 insertions, 14 deletions
diff --git a/run/dcpomatic b/run/dcpomatic index 1f00096cc..85816d810 100755 --- a/run/dcpomatic +++ b/run/dcpomatic @@ -1,25 +1,27 @@ #!/bin/bash +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" export LD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:/home/c.hetherington/lib:$LD_LIBRARY_PATH export DYLD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:/carl/Environment/64/lib +exe=$DIR/../build/src/tools/dcpomatic2 if [ "$1" == "--debug" ]; then shift - gdb --args build/src/tools/dcpomatic2 $* + gdb --args $exe $* elif [ "$1" == "--valgrind" ]; then shift - valgrind --tool="memcheck" --suppressions=suppressions --track-fds=yes --show-leak-kinds=all --leak-check=full build/src/tools/dcpomatic2 $* + valgrind --tool="memcheck" --suppressions=suppressions --track-fds=yes --show-leak-kinds=all --leak-check=full $exe $* elif [ "$1" == "--callgrind" ]; then shift - valgrind --tool="callgrind" build/src/tools/dcpomatic2 $* + valgrind --tool="callgrind" $exe $* elif [ "$1" == "--massif" ]; then shift - valgrind --tool="massif" build/src/tools/dcpomatic2 $* + valgrind --tool="massif" $exe $* elif [ "$1" == "--i18n" ]; then shift - LANGUAGE=fr_FR.UTF8 LANG=fr_FR.UTF8 LC_ALL=fr_FR.UTF8 build/src/tools/dcpomatic2 "$*" + LANGUAGE=fr_FR.UTF8 LANG=fr_FR.UTF8 LC_ALL=fr_FR.UTF8 $exe "$*" elif [ "$1" == "--perf" ]; then shift - perf record build/src/tools/dcpomatic2 $* + perf record $exe $* else - build/src/tools/dcpomatic2 $* + $exe $* fi diff --git a/run/dcpomatic_player b/run/dcpomatic_player index 9f2883403..c24e20810 100755 --- a/run/dcpomatic_player +++ b/run/dcpomatic_player @@ -1,25 +1,27 @@ #!/bin/bash +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" export LD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:/home/c.hetherington/lib:$LD_LIBRARY_PATH export DYLD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:/carl/Environment/64/lib +exe=$DIR/../build/src/tools/dcpomatic2_player if [ "$1" == "--debug" ]; then shift - gdb --args build/src/tools/dcpomatic2_player $* + gdb --args $exe $* elif [ "$1" == "--valgrind" ]; then shift - valgrind --tool="memcheck" --suppressions=suppressions --track-fds=yes build/src/tools/dcpomatic2_player $* + valgrind --tool="memcheck" --suppressions=suppressions --track-fds=yes $exe $* elif [ "$1" == "--callgrind" ]; then shift - valgrind --tool="callgrind" build/src/tools/dcpomatic2_player $* + valgrind --tool="callgrind" $exe $* elif [ "$1" == "--massif" ]; then shift - valgrind --tool="massif" build/src/tools/dcpomatic2_player $* + valgrind --tool="massif" $exe $* elif [ "$1" == "--i18n" ]; then shift - LANGUAGE=fr_FR.UTF8 LANG=fr_FR.UTF8 LC_ALL=fr_FR.UTF8 build/src/tools/dcpomatic2_player "$*" + LANGUAGE=fr_FR.UTF8 LANG=fr_FR.UTF8 LC_ALL=fr_FR.UTF8 $exe "$*" elif [ "$1" == "--perf" ]; then shift - perf record build/src/tools/dcpomatic2_player $* + perf record $exe $* else - build/src/tools/dcpomatic2_player $* + $exe $* fi |