[game-data-packager] 01/01: doom_common: fix recent regression, add arch support

[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 2ba93324aa6bfa743df0ab4b76ed7b0c607793e6
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Thu Nov 19 22:32:41 2015 +0100

    doom_common: fix recent regression, add arch support
---
 game_data_packager/games/doom_common.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/game_data_packager/games/doom_common.py b/game_data_packager/games/doom_common.py
index 98fe7c8..59d3c11 100644
--- a/game_data_packager/games/doom_common.py
+++ b/game_data_packager/games/doom_common.py
@@ -77,7 +77,10 @@ class DoomGameData(GameData):
         }
 
         for package in self.packages.values():
-            package.install_to = ASSETS + '/doom'
+            if FORMAT == 'arch':
+                package.install_to = 'usr/share/games/doom'
+            else:
+                package.install_to = ASSETS + '/doom'
             engine = package.engine or self.engine
             engine = engine.split('|')[-1].strip()
             package.program = package_map.get(engine, engine)
@@ -152,10 +155,10 @@ class DoomTask(PackagingTask):
             elif package.expansion_for:
                 iwad = self.game.packages[package.expansion_for].only_file
                 assert iwad is not None, "Couldn't find %s's IWAD" % main_wad
-                args = (  '-iwad /' + package.install_to + iwad
-                       + ' -file /' + package.install_to + main_wad)
+                args = (  '-iwad /' + package.install_to + '/' + iwad
+                       + ' -file /' + package.install_to + '/' + main_wad)
             else:
-                args = '-iwad /' + package.install_to + main_wad
+                args = '-iwad /' + package.install_to + '/' + main_wad
             entry['Exec'] = package.program + ' ' + args
             entry['Icon'] = desktop_file
             entry['Terminal'] = 'false'

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