[openarena] 03/03: Always run ioquake3 by its absolute path

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch wip/flatpak-app
in repository openarena.

commit 09313b246542e6fd9826f17528dc058ad600d2d6
Author: Simon McVittie <smcv at collabora.com>
Date:   Sat Jul 29 01:45:45 2017 +0100

    Always run ioquake3 by its absolute path
    
    If we find it via PATH then it won't know its own location, so it won't
    be able to find renderers relative to itself.
---
 debian/scripts/openarena.in | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/scripts/openarena.in b/debian/scripts/openarena.in
index 9373a67..8955177 100644
--- a/debian/scripts/openarena.in
+++ b/debian/scripts/openarena.in
@@ -11,7 +11,11 @@ IOQ3BINARY=@IOQ3BINARY@
 FS_BASEPATH=@FS_BASEPATH@
 
 # Be independent of whether ioquake3 has also been relocated
-PATH="${libdir}/ioquake3:/usr/lib/ioquake3:$PATH"
+if [ -e "${libdir}/ioquake3/${IOQ3BINARY}" ]; then
+    ENGINE="${libdir}/ioquake3/${IOQ3BINARY}"
+else
+    ENGINE="/usr/lib/ioquake3/${IOQ3BINARY}"
+fi
 
 DEBUGGER="$OPENARENA_DEBUGGER"
 
@@ -73,7 +77,7 @@ if test "z$QUIET" = z1; then
 fi
 
 if test -n "$OPENARENA_BACKTRACE"; then
-  exec gdb -return-child-result -batch -ex run -ex 'thread apply all bt full' -ex kill -ex quit --args ${IOQ3BINARY} ${CVARS} "$@"
+  exec gdb -return-child-result -batch -ex run -ex 'thread apply all bt full' -ex kill -ex quit --args ${ENGINE} ${CVARS} "$@"
 else
-  exec ${DEBUGGER} ${IOQ3BINARY} ${CVARS} "$@"
+  exec ${DEBUGGER} ${ENGINE} ${CVARS} "$@"
 fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openarena.git