standarddir: Fix custom basedirs with flatpak

See https://github.com/flathub/org.qutebrowser.qutebrowser/issues/18#issuecomment-802827816

1 files changed, 8 insertions, 9 deletions

diff --git a/qutebrowser/utils/standarddir.py b/qutebrowser/utils/standarddir.py
index 7bb632b57..c1ba0a73e 100644
--- a/qutebrowser/utils/standarddir.py
+++ b/qutebrowser/utils/standarddir.py
@@ -232,16 +232,15 @@ def _init_runtime(args: Optional[argparse.Namespace]) -> None:
         # Unfortunately this path could get too long for sockets (which have a
         # maximum length of 104 chars), so we don't add the username here...
 
-    if version.is_flatpak():
-        # We need a path like /run/user/1000/app/org.qutebrowser.qutebrowser rather than
-        # /run/user/1000/qutebrowser on Flatpak, since that's bind-mounted in a way that
-        # it is accessible by any other qutebrowser instances.
-        *parts, app_name = os.path.split(path)
-        assert app_name == APPNAME, app_name
-        path = os.path.join(*parts, 'app', os.environ['FLATPAK_ID'])
-    else:
-        _create(path)
+        if version.is_flatpak():
+            # We need a path like /run/user/1000/app/org.qutebrowser.qutebrowser rather than
+            # /run/user/1000/qutebrowser on Flatpak, since that's bind-mounted in a way that
+            # it is accessible by any other qutebrowser instances.
+            *parts, app_name = os.path.split(path)
+            assert app_name == APPNAME, app_name
+            path = os.path.join(*parts, 'app', os.environ['FLATPAK_ID'])
 
+    _create(path)
     _locations[_Location.runtime] = path