don't use flatpak env variable

ApostropheEditor · May 13, 2018 · 0cbb9ae · 0cbb9ae
1 parent 2a85ad9
commit 0cbb9ae
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -36,7 +36,7 @@ def package_files(directory):
 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
@@ -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(