renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

LuaDefaults: Look for defaults.lua in $PWD first

Browse Source 
As DataDir may not exist yet.

Fix #9593
This commit is contained in:
NiLuJe
2022-10-06 02:34:51 +02:00
parent 6cb8297362
commit ad22942108
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/luadefaults.lua
View File

@@ -46,11 +46,14 @@ function LuaDefaults:open(path)
-- The actual defaults file, on the other hand, is set in stone.
-- We just have to deal with some platform shenanigans...
local defaults_path = DataStorage:getDataDir() .. "/defaults.lua"
-- NOTE: On most platforms, $PWD should be our "install" folder, so look there first,
-- as DataDir may point elsewhere, and that elsewhere may not exist yet ;).
local defaults_path = "defaults.lua"
if isAndroid then
defaults_path = android.dir .. "/defaults.lua"
elseif os.getenv("APPIMAGE") then
defaults_path = "defaults.lua"
elseif not util.fileExists(defaults_path) then
-- You probably have bigger problems than this if we didn't find it in the install folder, but, oh, well ;).
defaults_path = DataStorage:getDataDir() .. "/defaults.lua"
end
ok, stored = pcall(dofile, defaults_path)
if ok and stored then