From 19b5a489cff07202baa0f087cbbea4a225bb7e89 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Sun, 11 Dec 2016 14:20:35 +0200 Subject: [PATCH] (hopefully) Fix the portable build once and for all --- builders/windows-builder.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/builders/windows-builder.py b/builders/windows-builder.py index 5cf8a4d..010c091 100644 --- a/builders/windows-builder.py +++ b/builders/windows-builder.py @@ -225,10 +225,11 @@ 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.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.join(self.dist_path, 'OpenLPPortable_%s.paf.exe' % self.portable_version)) + portable_exe_name = 'OpenLPPortable_%s.paf.exe' % self.portable_version + portable_exe_path = os.path.join(self.portable_dest_path, '..', portable_exe_name) + self._print_verbose('... Portable Build: {}'.format(portable_exe_path)) + if os.path.exists(portable_exe_path): + move(portable_exe_path, os.path.join(self.dist_path, portable_exe_name)) self._print('PortableApp build complete') else: raise Exception('PortableApp failed to build') @@ -269,7 +270,7 @@ class WindowsBuilder(Builder): Add extra arguments to the command line argument parser """ parser.add_argument('--portable', action='store_true', default=False, - help='Specify the path to build the portable installation.') + help='Build a PortableApps.com build of OpenLP too') def setup_system_paths(self): """