[game-data-packager] 02/12: runtime: Support more substitutions for missing-data.txt

[Simon McVittie]

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

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

commit e46134604ca688b620b5ec17edfd229f733365c3
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Jul 3 10:49:31 2017 +0100

    runtime: Support more substitutions for missing-data.txt
---
 runtime/gdp_launcher_base.py            | 3 +++
 runtime/launch-etqw-dedicated.yaml.in   | 1 +
 runtime/launch-quake-server.yaml.in     | 1 +
 runtime/launch-quake2-server.yaml.in    | 1 +
 runtime/launch-quake3-server.yaml.in    | 1 +
 runtime/launch-quake4-dedicated.yaml.in | 1 +
 runtime/launch-unreal-gold.yaml.in      | 1 +
 7 files changed, 9 insertions(+)

diff --git a/runtime/gdp_launcher_base.py b/runtime/gdp_launcher_base.py
index 8acd640..107858e 100755
--- a/runtime/gdp_launcher_base.py
+++ b/runtime/gdp_launcher_base.py
@@ -126,6 +126,7 @@ class Launcher:
         self.data = json.load(open('%s/launch-%s.json' % (RUNTIME_BUILT,
             self.id), encoding='utf-8'))
 
+        self.game = self.data.get('game', self.id)
         self.binary_only = self.data.get('binary_only', False)
         logger.debug('Binary-only: %r', self.binary_only)
         self.required_files = self.data['required_files']
@@ -446,6 +447,8 @@ class Launcher:
             else:
                 text = string.Template(text).safe_substitute(
                         distro=DISTRO,
+                        game=self.game,
+                        id=self.id,
                         name=self.name,
                         )
                 # strip single \n
diff --git a/runtime/launch-etqw-dedicated.yaml.in b/runtime/launch-etqw-dedicated.yaml.in
index ac8bedd..be3da30 100644
--- a/runtime/launch-etqw-dedicated.yaml.in
+++ b/runtime/launch-etqw-dedicated.yaml.in
@@ -1,4 +1,5 @@
 ---
+game: etqw
 binary_only: true
 engine: $prefix/lib/etqw/etqwded.x86
 required_files:
diff --git a/runtime/launch-quake-server.yaml.in b/runtime/launch-quake-server.yaml.in
index c7d3f1c..b6040b9 100644
--- a/runtime/launch-quake-server.yaml.in
+++ b/runtime/launch-quake-server.yaml.in
@@ -1,4 +1,5 @@
 ---
+game: quake
 dot_directory: null
 base_directories:
   - /usr/share/games/quake
diff --git a/runtime/launch-quake2-server.yaml.in b/runtime/launch-quake2-server.yaml.in
index e74f65f..32dc3aa 100644
--- a/runtime/launch-quake2-server.yaml.in
+++ b/runtime/launch-quake2-server.yaml.in
@@ -1,4 +1,5 @@
 ---
+game: quake2
 dot_directory: null
 base_directories:
   - /usr/share/games/quake2
diff --git a/runtime/launch-quake3-server.yaml.in b/runtime/launch-quake3-server.yaml.in
index 0973a8c..2a5fad1 100644
--- a/runtime/launch-quake3-server.yaml.in
+++ b/runtime/launch-quake3-server.yaml.in
@@ -1,4 +1,5 @@
 ---
+game: quake3
 dot_directory: ~/.q3a
 engines:
   - $prefix/lib/ioquake3/ioq3ded
diff --git a/runtime/launch-quake4-dedicated.yaml.in b/runtime/launch-quake4-dedicated.yaml.in
index 04c8d86..b468400 100644
--- a/runtime/launch-quake4-dedicated.yaml.in
+++ b/runtime/launch-quake4-dedicated.yaml.in
@@ -1,4 +1,5 @@
 ---
+game: quake4
 binary_only: true
 engine: $prefix/lib/quake4/q4ded.x86
 required_files:
diff --git a/runtime/launch-unreal-gold.yaml.in b/runtime/launch-unreal-gold.yaml.in
index 4ce295c..2ca7ae9 100644
--- a/runtime/launch-unreal-gold.yaml.in
+++ b/runtime/launch-unreal-gold.yaml.in
@@ -1,4 +1,5 @@
 ---
+game: unreal
 binary_only: true
 required_files:
   - System/Core.so

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