From a7fd7a0aee2b48988eb6b067fadf1b6d9ebeceba Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 5 Jun 2019 08:17:03 +0530 Subject: [PATCH] DRYer --- bypy/linux/__main__.py | 4 ++-- bypy/macos/__main__.py | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bypy/linux/__main__.py b/bypy/linux/__main__.py index 5e27cfecda..ea19369e69 100644 --- a/bypy/linux/__main__.py +++ b/bypy/linux/__main__.py @@ -15,7 +15,7 @@ import time from functools import partial from bypy.constants import ( - PREFIX, SRC as CALIBRE_DIR, SW, is64bit, python_major_minor_version + OUTPUT_DIR, PREFIX, SRC as CALIBRE_DIR, is64bit, python_major_minor_version ) from bypy.pkgs.qt import PYQT_MODULES, QT_DLLS, QT_PLUGINS from bypy.utils import ( @@ -252,7 +252,7 @@ def strip_binaries(env): def create_tarfile(env, compression_level='9'): print('Creating archive...') - base = os.path.join(SW, 'dist') + base = OUTPUT_DIR try: shutil.rmtree(base) except EnvironmentError as err: diff --git a/bypy/macos/__main__.py b/bypy/macos/__main__.py index 89b830e0d2..d249f6b7ff 100644 --- a/bypy/macos/__main__.py +++ b/bypy/macos/__main__.py @@ -22,12 +22,11 @@ from functools import partial, reduce from itertools import repeat from bypy.constants import ( - PREFIX, PYTHON, SRC as CALIBRE_DIR, SW, python_major_minor_version + OUTPUT_DIR, PREFIX, PYTHON, SRC as CALIBRE_DIR, python_major_minor_version ) from bypy.pkgs.qt import PYQT_MODULES, QT_DLLS, QT_PLUGINS from bypy.utils import current_dir, mkdtemp, py_compile, timeit, walk - abspath, join, basename, dirname = os.path.abspath, os.path.join, os.path.basename, os.path.dirname calibre_constants = globals()['init_env']['calibre_constants'] py_ver = '.'.join(map(str, python_major_minor_version())) @@ -673,7 +672,7 @@ class Freeze(object): ''' Copy a directory d into a dmg named volname ''' print('\nSigning...') sys.stdout.flush() - destdir = os.path.join(SW, 'dist') + destdir = OUTPUT_DIR try: shutil.rmtree(destdir) except EnvironmentError as err: