diff --git a/easymacro.py b/easymacro.py index 56b86c4..5be5661 100644 --- a/easymacro.py +++ b/easymacro.py @@ -129,12 +129,15 @@ DESKTOP = os.environ.get('DESKTOP_SESSION', '') INFO_DEBUG = '{}\n\n{}\n\n{}'.format(sys.version, platform.platform(), '\n'.join(sys.path)) IS_WIN = OS == 'Windows' +IS_MAC = OS == 'Darwin' + LOG_NAME = 'ZAZ' CLIPBOARD_FORMAT_TEXT = 'text/plain;charset=utf-16' PYTHON = 'python' if IS_WIN: PYTHON = 'python.exe' + CALC = 'calc' WRITER = 'writer' @@ -4168,7 +4171,11 @@ def get_config_path(name='Work'): def get_path_python(): path = get_config_path('Module') - return join(path, PYTHON) + if IS_MAC: + path = join(path, '..', 'Resources', PYTHON) + else: + path = join(path, PYTHON) + return path # ~ Export ok diff --git a/files/ZAZPip_v0.4.0.oxt b/files/ZAZPip_v0.4.0.oxt index c2345d8..f8aac1e 100644 Binary files a/files/ZAZPip_v0.4.0.oxt and b/files/ZAZPip_v0.4.0.oxt differ diff --git a/source/pythonpath/easymacro.py b/source/pythonpath/easymacro.py index 56b86c4..5be5661 100644 --- a/source/pythonpath/easymacro.py +++ b/source/pythonpath/easymacro.py @@ -129,12 +129,15 @@ DESKTOP = os.environ.get('DESKTOP_SESSION', '') INFO_DEBUG = '{}\n\n{}\n\n{}'.format(sys.version, platform.platform(), '\n'.join(sys.path)) IS_WIN = OS == 'Windows' +IS_MAC = OS == 'Darwin' + LOG_NAME = 'ZAZ' CLIPBOARD_FORMAT_TEXT = 'text/plain;charset=utf-16' PYTHON = 'python' if IS_WIN: PYTHON = 'python.exe' + CALC = 'calc' WRITER = 'writer' @@ -4168,7 +4171,11 @@ def get_config_path(name='Work'): def get_path_python(): path = get_config_path('Module') - return join(path, PYTHON) + if IS_MAC: + path = join(path, '..', 'Resources', PYTHON) + else: + path = join(path, PYTHON) + return path # ~ Export ok