[game-data-packager] 01/02: also search for games assets in 'Program Files (x86)' dirs

[Alexandre Detiste]

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

detiste-guest pushed a commit to branch master
in repository game-data-packager.

commit 115f6d4a022cadee3b8be8d6ab63e3d4ce78c0c8
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Sun Aug 28 11:30:58 2016 +0200

    also search for games assets in 'Program Files (x86)' dirs
---
 debian/changelog            | 1 +
 game_data_packager/build.py | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b62b7c6..04871e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ game-data-packager (46) UNRELEASED; urgency=medium
       matching yamagi-quake2 5.34 and adding support for more
       architectures [smcv]
   * Enhancements and bug fixes:
+    - also search for games assets in 'Program Files (x86)' directories
   * Internal changes:
 
  -- Simon McVittie <smcv at debian.org>  Fri, 01 Jul 2016 10:30:08 +0100
diff --git a/game_data_packager/build.py b/game_data_packager/build.py
index 51149d2..e596aad 100644
--- a/game_data_packager/build.py
+++ b/game_data_packager/build.py
@@ -178,6 +178,9 @@ def iter_fat_mounts(folder):
         for line in mounts.readlines():
             mount, vfstype = line.split(' ')[1:3]
             if vfstype in ('fat', 'vfat', 'ntfs'):
+                path = os.path.join(mount, 'Program Files (x86)', folder)
+                if os.path.isdir(path):
+                    yield path
                 path = os.path.join(mount, 'Program Files', folder)
                 if os.path.isdir(path):
                     yield path
@@ -2479,8 +2482,11 @@ class PackagingTask(object):
                 os.path.expanduser('~/.steam'),
                 os.path.join(os.environ.get('XDG_DATA_HOME', os.path.expanduser('~/.local/share')),
                     'wineprefixes/steam/drive_c/Program Files/Steam'),
+                os.path.join(os.environ.get('XDG_DATA_HOME', os.path.expanduser('~/.local/share')),
+                    'wineprefixes/steam/drive_c/Program Files (x86)/Steam'),
                 os.path.expanduser('~/Steam'),
                 os.path.expanduser('~/.wine/drive_c/Program Files/Steam'),
+                os.path.expanduser('~/.wine/drive_c/Program Files (x86)/Steam'),
                 os.path.expanduser('~/.PlayOnLinux/wineprefix/Steam/drive_c/Program Files/Steam'),
                 ) + tuple(iter_fat_mounts('Steam')):
             if not os.path.isdir(prefix):

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