Package: doomsday
Version: 1.14.5-2
Severity: normal
Tags: patch
Hi again,
currently, the doomsday-compat script requires a full path as an
argument to the -file parameter. That is, only paths relative to the
current working directory are considered.
However, any other doom engine also looks for the PWAD file name
passed as an argument to the -file parameter in the directory
specified for searching for IWADs. Since the purpose of the
doomsday-compat script is to emulate the command line parsing
behaviour of any other doom engine, this needs to get hacked in. I
changed the script so that if the file passed over to the -file
parameter is not found relative to the current working directory, it
is searched for in the directory specified by the iwaddir variable.
The patch applies on top of the other patch I submitted in #787985.
Thanks,
Fabian
-- System Information:
Debian Release: stretch/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'experimental'), (500, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.0.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Versions of packages doomsday depends on:
ii libc6 2.19-18
ii libfluidsynth1 1.1.6-2
ii libgcc1 1:5.1.1-7
ii libgl1-mesa-glx [libgl1] 10.5.5-1
ii libqt4-network 4:4.8.6+git155-g716fbae+dfsg-2
ii libqt4-opengl 4:4.8.6+git155-g716fbae+dfsg-2
ii libqtcore4 4:4.8.6+git155-g716fbae+dfsg-2
ii libqtgui4 4:4.8.6+git155-g716fbae+dfsg-2
ii libsdl-mixer1.2 1.2.12-11+b1
ii libsdl1.2debian 1.2.15-11
ii libstdc++6 5.1.1-7
ii libx11-6 2:1.6.3-1
ii libxrandr2 2:1.4.2-1+b1
ii libxxf86vm1 1:1.1.4-1
ii zlib1g 1:1.2.8.dfsg-2+b1
Versions of packages doomsday recommends:
ii doom-wad-shareware [doom-wad] 1.9.fixed-2
pn fluid-soundfont-gm <none>
ii freedm [doom-wad] 0.9-1
ii freedoom [boom-wad] 0.9-1
ii game-data-packager 41
doomsday suggests no packages.
-- no debconf information
diff --git a/debian/doomsday-compat b/debian/doomsday-compat
index 05bda09..6efd3eb 100755
--- a/debian/doomsday-compat
+++ b/debian/doomsday-compat
@@ -28,7 +28,7 @@ DOOMSDAY="doomsday"
next_is_iwad=0
next_is_pwad=0
-iwaddir=""
+iwaddir="$(awk '/^iwaddir/{print $2}' /etc/doomsday/paths)"
gamemode="doom2"
for arg in "$@"
@@ -59,6 +59,10 @@ do
next_is_pwad=0
pwadpath=$arg
pwadfile=$(basename $arg)
+ if [ ! -f $pwadpath -a -f $iwaddir/$pwadpath ]
+ then
+ pwadpath=$iwaddir/$pwadpath
+ fi
continue
fi
