From f82ead2b39ef0a91ac384863103bf8e318302d10 Mon Sep 17 00:00:00 2001 From: Alberto Date: Sun, 5 Dec 2021 21:16:22 +0100 Subject: [PATCH] Fix koreader not using XDG_CONFIG_HOME on linux (#8507) --- datastorage.lua | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/datastorage.lua b/datastorage.lua index bce2ea07d..8f20a6b68 100644 --- a/datastorage.lua +++ b/datastorage.lua @@ -18,8 +18,12 @@ function DataStorage:getDataDir() -- confined ubuntu app has write access to this dir data_dir = string.format("%s/%s", os.getenv("XDG_DATA_HOME"), package_name) elseif os.getenv("APPIMAGE") or os.getenv("KO_MULTIUSER") then - local user_rw = jit.os == "OSX" and "Library/Application Support" or ".config" - data_dir = string.format("%s/%s/%s", os.getenv("HOME"), user_rw, "koreader") + if os.getenv("XDG_CONFIG_HOME") then + data_dir = string.format("%s/%s", os.getenv("XDG_CONFIG_HOME"), "koreader") + else + local user_rw = jit.os == "OSX" and "Library/Application Support" or ".config" + data_dir = string.format("%s/%s/%s", os.getenv("HOME"), user_rw, "koreader") + end else data_dir = "." end