Fix TWBT file replacement handling (fixes #159)

Bump version number to 0.13b
Pidgeot · Sep 17, 2018 · cc0f8dc · cc0f8dc
1 parent 6ea5e60
commit cc0f8dc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/core/graphics.py b/core/graphics.py
@@ -161,12 +161,14 @@ def install_graphics(pack):
         # TwbT file replacements
         if 'TWBT' in lnp.settings.printmode:
             for folder in ['graphics', 'objects']:
-                twbt_folder = paths.get(folder, '..', 'twbt_'+folder)
-                target_folder = paths.get(folder)
+                twbt_folder = paths.get('graphics', pack, 'raw', 'twbt_'+folder)
+                target_folder = paths.get('df', 'raw', folder)
+
                 for path, _, files in os.walk(twbt_folder):
                     for f in files:
                         twbt_f = os.path.join(path, f)
-                        target_f = twbt_f.replace(twbt_folder, target_folder)
+                        target_f = os.path.join(target_folder, os.path.relpath(
+                            twbt_f, twbt_folder))
                         shutil.copyfile(twbt_f, target_f)
 
     except:

diff --git a/core/lnp.py b/core/lnp.py
@@ -9,7 +9,7 @@
 
 from .json_config import JSONConfiguration
 
-VERSION = '0.13a'
+VERSION = '0.13b'
 
 # pylint:disable=too-many-instance-attributes