From ff15af3dbebd6b4b36b74bfb9bd6dd7ac6ac81b2 Mon Sep 17 00:00:00 2001 From: coderkun Date: Tue, 2 Aug 2016 11:13:59 +0200 Subject: [PATCH] fix setting environment for GSettings schema dir --- mcg.py | 5 ----- mcg/__init__.py | 13 ++++++++++++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/mcg.py b/mcg.py index 7b5f004..8ff8819 100755 --- a/mcg.py +++ b/mcg.py @@ -12,11 +12,6 @@ from mcg.application import Application if __name__ == "__main__": - # Set environment - srcdir = os.path.abspath(os.path.dirname(__file__)) - if not os.environ.get('GSETTINGS_SCHEMA_DIR'): - os.environ['GSETTINGS_SCHEMA_DIR'] = os.path.join(srcdir, 'data') - # Start application app = Application() exit_status = app.run(sys.argv) diff --git a/mcg/__init__.py b/mcg/__init__.py index e56acfb..b13face 100644 --- a/mcg/__init__.py +++ b/mcg/__init__.py @@ -1,5 +1,16 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- +import os + + + +# Set environment +srcdir = os.path.abspath(os.path.dirname(__file__)) +datadir = os.path.join(srcdir, '..', 'data') + +# Set GSettings schema dir (if not set already) +if not os.environ.get('GSETTINGS_SCHEMA_DIR'): + os.environ['GSETTINGS_SCHEMA_DIR'] = datadir