From 0cbb9aecf0949537bd6c680cc41a9c049cd2778a Mon Sep 17 00:00:00 2001
From: somas95 <manuel.genoves@gmail.com>
Date: Sun, 13 May 2018 16:50:10 +0200
Subject: [PATCH] don't use flatpak env variable

---
 flatpak/uberwriter.json            | 3 +--
 setup.py                           | 2 +-
 uberwriter_lib/uberwriterconfig.py | 3 ++-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/flatpak/uberwriter.json b/flatpak/uberwriter.json
index 4447097..a19bb43 100644
--- a/flatpak/uberwriter.json
+++ b/flatpak/uberwriter.json
@@ -18,8 +18,7 @@
     ],
     "build-options" : {
       "env": {
-        "PYTHON": "python3",
-        "IN_FLATPAK": "1"
+        "PYTHON": "python3"
         }
     },
     "add-extensions": {
diff --git a/setup.py b/setup.py
index 299b457..8db0760 100644
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,7 @@ from pprint import pprint
 pprint(extra_files_ui)
 pprint(extra_files_media)
 
-if os.environ.get('IN_FLATPAK'):
+if os.path.isfile("/.flatpak-info"):
     app_prefix = '/app/'
 else:
     app_prefix = ''
diff --git a/uberwriter_lib/uberwriterconfig.py b/uberwriter_lib/uberwriterconfig.py
index df525d7..38e694c 100644
--- a/uberwriter_lib/uberwriterconfig.py
+++ b/uberwriter_lib/uberwriterconfig.py
@@ -55,7 +55,8 @@ def get_data_path():
     """
 
     # Get pathname absolute or relative.
-    if os.environ.get("IN_FLATPAK"):
+    # TODO: Abstract this (the old env IN_FLATPAK)
+    if os.path.isfile("/.flatpak-info"):
         return '/app/opt/uberwriter/data/'
 
     path = os.path.join(