From 9e816154ad62cd9b9df7aaa3507d522b1c786690 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 8 Oct 2022 14:48:30 -0400 Subject: [PATCH] Added in an additional ENVVAR for setting USERDIR, and also changed / to PATHSEP. (#1139) * Added in an additional ENVVAR for setting USERDIR, and also changed / to PATHSEP. * Forgot a / --- data/core/start.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/data/core/start.lua b/data/core/start.lua index 76dae8ce..d504108a 100644 --- a/data/core/start.lua +++ b/data/core/start.lua @@ -10,11 +10,12 @@ if MACOS_RESOURCES then DATADIR = MACOS_RESOURCES else local prefix = EXEDIR:match("^(.+)[/\\]bin$") - DATADIR = prefix and (prefix .. '/share/lite-xl') or (EXEDIR .. '/data') + DATADIR = prefix and (prefix .. PATHSEP .. 'share' .. PATHSEP .. 'lite-xl') or (EXEDIR .. PATHSEP .. 'data') end -USERDIR = (system.get_file_info(EXEDIR .. '/user') and (EXEDIR .. '/user')) - or ((os.getenv("XDG_CONFIG_HOME") and os.getenv("XDG_CONFIG_HOME") .. "/lite-xl")) - or (HOME and (HOME .. '/.config/lite-xl')) +USERDIR = (system.get_file_info(EXEDIR .. PATHSEP .. 'user') and (EXEDIR .. PATHSEP .. 'user')) + or os.getenv("LITE_USERDIR") + or ((os.getenv("XDG_CONFIG_HOME") and os.getenv("XDG_CONFIG_HOME") .. PATHSEP .. "lite-xl")) + or (HOME and (HOME .. PATHSEP .. '.config' .. PATHSEP .. 'lite-xl')) package.path = DATADIR .. '/?.lua;' package.path = DATADIR .. '/?/init.lua;' .. package.path