From d35f8e8b415a55a36f64e9ffc625836ed49fae4c Mon Sep 17 00:00:00 2001
From: Manthan Sharma <hitechmanthan@gmail.com>
Date: Mon, 23 Jan 2017 17:46:18 +0530
Subject: [PATCH 1/2] add env. variable

---
 designer/__main__.py           |  5 +++--
 designer/tools/bug_reporter.py | 12 ++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/designer/__main__.py b/designer/__main__.py
index 4c60f03..d813e5a 100644
--- a/designer/__main__.py
+++ b/designer/__main__.py
@@ -1,4 +1,4 @@
-import os.path
+from os import path, environ
 
 from designer.app import DesignerApp
 from designer.utils.utils import get_fs_encoding
@@ -6,7 +6,8 @@
 
 
 def main():
-    data = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'data')
+    data = path.join(path.dirname(path.abspath(__file__)), 'data')
+    environ['designer_source_dir'] = path.dirname(path.abspath(__file__))
     if isinstance(data, bytes):
         data = data.decode(get_fs_encoding())
     resource_add_path(data)
diff --git a/designer/tools/bug_reporter.py b/designer/tools/bug_reporter.py
index 6babf93..3f9766a 100644
--- a/designer/tools/bug_reporter.py
+++ b/designer/tools/bug_reporter.py
@@ -167,11 +167,15 @@ def build(self):
             from pip.download import PipSession
             import platform
 
+            if os.getenv('designer_source_dir'):
+                source_dir = os.environ['designer_source_dir']
+            else:
+                source_dir = os.path.join(os.path.dirname(
+                    os.path.realpath(__file__)), '..')
+
             requirements = parse_requirements(os.path.join(
-                os.path.dirname(os.path.realpath(__file__)),
-                '..',
-                '..',
-                'requirements.txt'),
+                source_dir,
+                '..', 'requirements.txt'),
                 session=PipSession()
             )
             env_info = ''

From 38b640e1e39b089b43d5b58c20003afc51de8827 Mon Sep 17 00:00:00 2001
From: Manthan Sharma <hitechmanthan@gmail.com>
Date: Tue, 7 Feb 2017 00:49:33 +0530
Subject: [PATCH 2/2] update get_kd_dir()

---
 designer/tools/bug_reporter.py | 8 +++-----
 designer/utils/utils.py        | 4 +++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/designer/tools/bug_reporter.py b/designer/tools/bug_reporter.py
index 3f9766a..28c0f8e 100644
--- a/designer/tools/bug_reporter.py
+++ b/designer/tools/bug_reporter.py
@@ -167,11 +167,9 @@ def build(self):
             from pip.download import PipSession
             import platform
 
-            if os.getenv('designer_source_dir'):
-                source_dir = os.environ['designer_source_dir']
-            else:
-                source_dir = os.path.join(os.path.dirname(
-                    os.path.realpath(__file__)), '..')
+            source_dir = os.getenv('designer_source_dir',
+                                   os.path.join(os.path.dirname(
+                                       os.path.realpath(__file__)), '..'))
 
             requirements = parse_requirements(os.path.join(
                 source_dir,
diff --git a/designer/utils/utils.py b/designer/utils/utils.py
index 217d786..dec854f 100644
--- a/designer/utils/utils.py
+++ b/designer/utils/utils.py
@@ -127,7 +127,9 @@ def get_config_dir():
 def get_kd_dir():
     '''Return kivy designer source/binaries folder
     '''
-    _dir = os.path.dirname(designer.__file__)
+    _dir = os.getenv('designer_source_dir',
+                     os.path.dirname(designer.__file__))
+
     if isinstance(_dir, bytes):
         _dir = _dir.decode(get_fs_encoding())
     return _dir