diff --git a/setup/unix-ci.py b/setup/unix-ci.py index 36a49636fc..edceaea801 100644 --- a/setup/unix-ci.py +++ b/setup/unix-ci.py @@ -19,11 +19,11 @@ def setenv(key, val): os.environ[key] = os.path.expandvars(val) -SWBASE = '/sw' -SW = SWBASE + '/sw' - if ismacos: + SWBASE = '/Users/Shared/calibre-build/sw' + SW = SWBASE + '/sw' + def install_env(): setenv('SWBASE', SWBASE) setenv('SW', SW) @@ -37,6 +37,9 @@ if ismacos: setenv('CALIBRE_QT_PREFIX', '$SW/qt') else: + SWBASE = '/sw' + SW = SWBASE + '/sw' + def install_env(): setenv('SW', SW) setenv('PATH', '$SW/bin:$PATH') @@ -77,8 +80,6 @@ def download_and_decompress(url, dest, compression=None): def run_python(*args): python = os.path.expandvars('$SW/bin/python') - if ismacos: - python += '2' if len(args) == 1: args = shlex.split(args[0]) args = [python] + list(args)