[game-data-packager] 04/05: Generalize support for $install_to in symlinks to cover $assets, etc.

[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 2b09e521b2883eb6128912526dfc112f9be20159
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Jan 3 17:27:48 2016 +0000

    Generalize support for $install_to in symlinks to cover $assets, etc.
---
 game_data_packager/build.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/game_data_packager/build.py b/game_data_packager/build.py
index 4296d15..61a59cc 100644
--- a/game_data_packager/build.py
+++ b/game_data_packager/build.py
@@ -26,6 +26,7 @@ import random
 import shutil
 import stat
 import subprocess
+import string
 import sys
 import tempfile
 import time
@@ -1577,10 +1578,17 @@ class PackagingTask(object):
         for symlink, real_file in package.symlinks.items():
             symlink = symlink.lstrip('/')
             real_file = real_file.lstrip('/')
-            if symlink.startswith('$install_to'):
-                symlink = package.install_to + symlink[len('$install_to'):]
-            if real_file.startswith('$install_to'):
-                real_file = package.install_to + real_file[len('$install_to'):]
+
+            symlink = string.Template(symlink).safe_substitute(
+                    assets=ASSETS,
+                    bindir=BINDIR,
+                    docdir=docdir,
+                    install_to=package.install_to)
+            real_file = string.Template(real_file).safe_substitute(
+                    assets=ASSETS,
+                    bindir=BINDIR,
+                    docdir=docdir,
+                    install_to=package.install_to)
 
             toplevel, rest = symlink.split('/', 1)
             if real_file.startswith(toplevel + '/'):

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