[SCM] Installer for game data files branch, master, updated. efd46d96e303f4a3f010a93ae2ee1d6c68315639

[Jon Dowland]

The following commit has been merged in the master branch:
commit 76495b786ac792bffc8fa738e6eed7ed22b1756e
Author: Jon Dowland <jmtd at debian.org>
Date:   Fri Sep 7 23:04:08 2012 +0100

    quake: guess_method: check for shareware first
    
    guess method would never match a shareware ZIP argument, because
    ifind will return true even if the supplied directory is a file.
    That needs fixing, but re-ordering the tests works for this narrow
    case.

diff --git a/supported/quake b/supported/quake
index 9739964..f725db0 100644
--- a/supported/quake
+++ b/supported/quake
@@ -82,7 +82,11 @@ go() {
 }
 
 guess_method() {
-    if ifind "$mountpoint" "id1/pak0.pak" >/dev/null; then
+    if [ -f "$mountpoint" ]; then
+        debug "treating $mountpoint like a shareware ZIP"
+        method="swzip"
+        swzip_method
+    elif ifind "$mountpoint" "id1/pak0.pak" >/dev/null; then
         debug "treating $mountpoint like an installed directory"
         method="dir"
         dir_method
@@ -90,11 +94,7 @@ guess_method() {
         debug "treating $mountpoint like a CD-ROM"
         method="cdrom"
         cdrom_method
-    elif [ -f "$mountpoint" ]; then
-        debug "treating $mountpoint like a shareware ZIP"
-        method="swzip"
-        swzip_method
-    elif [ -f "$mountpoint/hipnotic/pak0.pak" ]; then
+   elif [ -f "$mountpoint/hipnotic/pak0.pak" ]; then
         debug "treating $mountpoint like a Scourge of Armagon directory or CD"
         method="mp1"
         mp1_method

-- 
Installer for game data files