Move GRAMPS_RESOURCE default into grampsapp.main()

doczkal · Apr 15, 2016 · d71f949 · d71f949
1 parent dd55b36
commit d71f949
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Gramps.py b/Gramps.py
@@ -25,7 +25,5 @@
 
 From this position, import gramps works great
 """
-import os
-os.environ['GRAMPS_RESOURCES'] = os.path.dirname(os.path.abspath(__file__))
 import gramps.grampsapp as app
 app.main()
diff --git a/gramps/grampsapp.py b/gramps/grampsapp.py
@@ -442,6 +442,10 @@ def run():
         startcli(error, argpars)
 
 def main():
+    if 'GRAMPS_RESOURCES' not in os.environ:
+        resource_path, filename = os.path.split(os.path.abspath(__file__))
+        resource_path, dirname = os.path.split(resource_path)
+        os.environ['GRAMPS_RESOURCES'] = resource_path
     errors = run()
     if errors and isinstance(errors, list):
         for error in errors: