From 277186491af115d080a70e631276ea964f01bde6 Mon Sep 17 00:00:00 2001 From: Francesco Abbate Date: Wed, 2 Dec 2020 16:43:35 +0100 Subject: [PATCH] Fix some problems with user's directory To accommodate the Window's platform prefer the USERPROFILE to HOME to set user's dir. Fix error, user's dir was not added to the package.path. --- src/main.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main.c b/src/main.c index d9af075d..d9783a31 100644 --- a/src/main.c +++ b/src/main.c @@ -127,11 +127,14 @@ int main(int argc, char **argv) { " DATADIR = EXEDIR .. '/data'\n" " USERDIR = EXEDIR .. '/user'\n" #else - " local prefix = EXEDIR:match(\"^(.+)[/\\\\]bin$\")\n" - " DATADIR = prefix and (prefix .. '/share/lite-xl') or (EXEDIR .. '/data')\n" - " USERDIR = os.getenv(\"HOME\") .. '/.config/lite-xl'\n" - " package.path = package.path .. ';' .. DATADIR .. '/?.lua'\n" - " package.path = package.path .. ';' .. DATADIR .. '/?/init.lua'\n" + " do\n" + " local prefix = EXEDIR:match(\"^(.+)[/\\\\]bin$\")\n" + " DATADIR = prefix and (prefix .. '/share/lite-xl') or (EXEDIR .. '/data')\n" + " local home = os.getenv('USERPROFILE') or os.getenv('HOME')\n" + " USERDIR = home and home .. '/.config/lite-xl' or (EXEDIR .. '/user')\n" + " end\n" + " package.path = package.path .. ';' .. USERDIR .. '/?.lua'\n" + " package.path = package.path .. ';' .. USERDIR .. '/?/init.lua'\n" #endif " package.path = DATADIR .. '/?.lua;' .. package.path\n" " package.path = DATADIR .. '/?/init.lua;' .. package.path\n"