From a2c416b09b69975d335f064fd565ee86382fb33b Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Sat, 10 Dec 2016 23:12:38 +0200 Subject: [PATCH] Try to get the portable filename right --- builders/windows-builder.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/builders/windows-builder.py b/builders/windows-builder.py index b0af119..5cf8a4d 100644 --- a/builders/windows-builder.py +++ b/builders/windows-builder.py @@ -185,7 +185,7 @@ class WindowsBuilder(Builder): with open(os.path.join(config_dir, 'appinfo.ini.default'), 'r') as input_file, \ open(os.path.join(self.portable_dest_path, 'App', 'Appinfo', 'appinfo.ini'), 'w') as output_file: content = input_file.read() - content = content.replace('%(display_version)s', self.version) + content = content.replace('%(display_version)s', self.portable_version) content = content.replace('%(package_version)s', self.portable_version) output_file.write(content) @@ -225,11 +225,10 @@ class WindowsBuilder(Builder): self._print_verbose('... Building PortableApps Installer') self._run_command([self.portableinstaller_exe, self.portable_dest_path], 'Error running PortableApps Installer') - portable_app = os.path.abspath(os.path.join(self.portable_dest_path, '..', - 'OpenLPPortable_%s.paf.exe' % self.portable_version)) + portable_app = os.path.join(self.portable_dest_path, 'OpenLPPortable_%s.paf.exe' % self.portable_version) self._print_verbose('... Portable Build: {}'.format(portable_app)) if os.path.exists(portable_app): - move(portable_app, os.path.abspath(os.path.join(self.dist_path, '..'))) + move(portable_app, os.path.join(self.dist_path, 'OpenLPPortable_%s.paf.exe' % self.portable_version)) self._print('PortableApp build complete') else: raise Exception('PortableApp failed to build')