[game-data-packager] 01/01: Fix launcher scripts generated in BINDIR

[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 76d272921dfbf3fe973dd506a666967c0d35d61a
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Mon Nov 28 15:11:38 2016 +0100

    Fix launcher scripts generated in BINDIR
    
    I'm thinking about moving those bits of code to GDP-runtime
---
 debian/changelog                           | 3 +++
 game_data_packager/games/dosbox.py         | 6 +++---
 game_data_packager/games/scummvm_common.py | 3 ++-
 game_data_packager/games/z_code.py         | 4 +++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4f8714c..d36b3e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ game-data-packager (48) unstable; urgency=medium
   * Enhancements and bug fixes:
     - Add a button to "Doom II Masterlevels" launcher to start
       chocolate-doom-setup from there. [adetiste]
+    - Fix launcher scripts generated in BINDIR,
+      impacted games: Z-code text-mode adventures (H2G2, Zork...)
+      and multilingual ScummVM games [adetiste]
 
  -- Simon McVittie <smcv at debian.org>  Thu, 24 Nov 2016 08:15:30 +0100
 
diff --git a/game_data_packager/games/dosbox.py b/game_data_packager/games/dosbox.py
index b781004..565e30a 100755
--- a/game_data_packager/games/dosbox.py
+++ b/game_data_packager/games/dosbox.py
@@ -72,9 +72,9 @@ class DosboxTask(PackagingTask):
         super(DosboxTask, self).fill_extra_files(package, destdir)
 
         pgm = package.name[:len(package.name)-5]
-        mkdir_p(os.path.join(destdir, self.packaging.BINDIR.strip('/')))
-        os.symlink('dosgame',
-                   os.path.join(destdir, self.packaging.BINDIR.strip('/'), pgm))
+        bindir = self.packaging.substitute(self.packaging.BINDIR, package.name)
+        mkdir_p(os.path.join(destdir, bindir.strip('/')))
+        os.symlink('dosgame', os.path.join(destdir, bindir.strip('/'), pgm))
 
         appdir = os.path.join(destdir, 'usr/share/applications')
         mkdir_p(appdir)
diff --git a/game_data_packager/games/scummvm_common.py b/game_data_packager/games/scummvm_common.py
index 998db56..ced36a0 100644
--- a/game_data_packager/games/scummvm_common.py
+++ b/game_data_packager/games/scummvm_common.py
@@ -146,7 +146,8 @@ class ScummvmTask(PackagingTask):
         else:
             pgm = package.name[0:len(package.name)-len('-data')]
             entry['Exec'] = pgm
-            bindir = os.path.join(destdir, self.packaging.BINDIR.strip('/'))
+            bindir = self.packaging.substitute(self.packaging.BINDIR, package.name)
+            bindir = os.path.join(destdir, bindir.strip('/'))
             assert bindir.startswith(destdir + '/'), (bindir, destdir)
             mkdir_p(bindir)
             path = os.path.join(bindir, pgm)
diff --git a/game_data_packager/games/z_code.py b/game_data_packager/games/z_code.py
index 0f4e878..77988e4 100644
--- a/game_data_packager/games/z_code.py
+++ b/game_data_packager/games/z_code.py
@@ -123,8 +123,10 @@ class ZCodeTask(PackagingTask):
                     'usr/share/applications/%s.desktop %s'
                      % (package.name, engine))
 
-            bindir = os.path.join(destdir, self.packaging.BINDIR.strip('/'))
+            bindir = self.packaging.substitute(self.packaging.BINDIR, package.name)
+            bindir = os.path.join(destdir, bindir.strip('/'))
             assert bindir.startswith(destdir + '/'), (bindir, destdir)
+            assert '$' not in bindir
             mkdir_p(bindir)
             pgm = package.name[0:len(package.name)-len('-data')]
             path = os.path.join(bindir, pgm)

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