From fea160c5c4a0b89ab6f10f5556a5e14d3965ca7b Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Thu, 18 Mar 2010 15:43:27 +0000 Subject: [PATCH 1/3] AppLocation.PluginsDir changes --- openlp/core/utils/__init__.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py index 5d97dd8f2..61c38af87 100644 --- a/openlp/core/utils/__init__.py +++ b/openlp/core/utils/__init__.py @@ -43,7 +43,7 @@ class AppLocation(object): @staticmethod def get_directory(dir_type): if dir_type == AppLocation.AppDir: - return os.path.abspath(os.path.split(sys.argv[0])[0]) + return os.path.abspath(os.path.split(sys.argv[0])[0]) elif dir_type == AppLocation.ConfigDir: if sys.platform == u'win32': path = os.path.join(os.getenv(u'APPDATA'), u'openlp') @@ -71,11 +71,18 @@ class AppLocation(object): path = os.path.join(os.getenv(u'HOME'), u'.openlp', u'data') return path elif dir_type == AppLocation.PluginsDir: + plugin_path = None app_path = os.path.abspath(os.path.split(sys.argv[0])[0]) - if hasattr(sys, u'frozen') and sys.frozen == 1: - return os.path.join(app_path, u'plugins') + if sys.platform == u'win32': + if hasattr(sys, u'frozen') and sys.frozen == 1: + plugin_path = os.path.join(app_path, u'plugins') + else: + plugin_path = os.path.join(app_path, u'openlp', u'plugins') + elif sys.platform == u'darwin': + plugin_path = os.path.join(app_path, u'plugins') else: - return os.path.join(app_path, u'openlp', u'plugins') + plugin_path = os.path.join(openlp.__file__, u'plugins') + return plugin_path def check_latest_version(config, current_version): From 5d2fe81d712cfe34c2d043b5f66d2bf6f7ffe36e Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Thu, 18 Mar 2010 15:52:37 +0000 Subject: [PATCH 2/3] Fix for AppLocation changes --- openlp/core/utils/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py index 61c38af87..9cd539169 100644 --- a/openlp/core/utils/__init__.py +++ b/openlp/core/utils/__init__.py @@ -81,7 +81,8 @@ class AppLocation(object): elif sys.platform == u'darwin': plugin_path = os.path.join(app_path, u'plugins') else: - plugin_path = os.path.join(openlp.__file__, u'plugins') + plugin_path = os.path.join( + os.path.split(openlp.__file__)[0], u'plugins') return plugin_path From de767459bd4f4594498bbcf18218e46020db723b Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Thu, 18 Mar 2010 16:25:25 +0000 Subject: [PATCH 3/3] Fix 2 for AppLocation changes --- openlp/core/utils/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py index 9cd539169..3ffb9ee8d 100644 --- a/openlp/core/utils/__init__.py +++ b/openlp/core/utils/__init__.py @@ -23,6 +23,7 @@ # Temple Place, Suite 330, Boston, MA 02111-1307 USA # ############################################################################### +import openlp import os import sys import logging