better handling of some resources paths

bin/uberwriter

@@ -20,19 +20,22 @@
 import sys
 import os
 
+import pkg_resources
+
 import gettext
 import locale
 
+import uberwriter
+
 # Add project root directory (enable symlink and trunk execution)
 PROJECT_ROOT_DIRECTORY = os.path.abspath(
     os.path.dirname(os.path.dirname(os.path.realpath(sys.argv[0]))))
 
+locale_dir = os.path.abspath(os.path.join(os.path.dirname(uberwriter.__file__),'../po/'))
 if os.environ.get('IN_FLATPAK'):
     locale_dir = PROJECT_ROOT_DIRECTORY + '/lib/python3.5/site-packages/uberwriter-1.0-py3.5.egg/po'
-else:
-    locale_dir = PROJECT_ROOT_DIRECTORY + '/po'
-    
 
+ 
 # L10n
 locale.textdomain('uberwriter')
 locale.bindtextdomain('uberwriter', locale_dir)
@@ -55,5 +58,5 @@ if (os.path.exists(os.path.join(PROJECT_ROOT_DIRECTORY, 'uberwriter'))
 if python_path:
     os.putenv('PYTHONPATH', "%s:%s" % (os.getenv('PYTHONPATH', ''), ':'.join(python_path))) # for subprocesses
 
-import uberwriter
+
 uberwriter.main()

uberwriter_lib/uberwriterconfig.py

@@ -50,7 +50,7 @@ def get_data_path():
     """Retrieve uberwriter data path
 
     This path is by default <uberwriter_lib_path>/../data/ in trunk
-    and /usr/share/uberwriter in an installed version but this path
+    and /opt/uberwriter/data in an installed version but this path
     is specified at installation time.
     """
 
@@ -61,8 +61,12 @@ def get_data_path():
     path = os.path.join(
         os.path.dirname(__file__), __uberwriter_data_directory__)
 
+    # We try first if the data exists in the local folder and then
+    # in the system installation path
     abs_data_path = os.path.abspath(path)
     if not os.path.exists(abs_data_path):
+        abs_data_path = '/opt/uberwriter/data/'
+    elif not os.path.exists(abs_data_path):
         raise project_path_not_found
 
     return abs_data_path