From 491bf90358162dec2b4ca0a03d6fa98552968ddc Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Tue, 17 Jul 2018 16:13:49 -0300 Subject: cmd: only detect sysconfdir on Unix On the Windows single-binary this produces a weird "src/" path. --- src/luarocks/core/cfg.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua index cfbbd144..2606291c 100644 --- a/src/luarocks/core/cfg.lua +++ b/src/luarocks/core/cfg.lua @@ -66,15 +66,15 @@ end local function set_confdirs(cfg, platforms, hardcoded_sysconfdir) local sysconfdir = os.getenv("LUAROCKS_SYSCONFDIR") or hardcoded_sysconfdir - if not sysconfdir then - sysconfdir = detect_sysconfdir(cfg.lua_version) - end if platforms.windows then cfg.home = os.getenv("APPDATA") or "c:" cfg.home_tree = cfg.home.."/luarocks" cfg.homeconfdir = cfg.home_tree cfg.sysconfdir = sysconfdir or ((os.getenv("PROGRAMFILES") or "c:") .. "/luarocks") else + if not sysconfdir then + sysconfdir = detect_sysconfdir(cfg.lua_version) + end cfg.home = os.getenv("HOME") or "" cfg.home_tree = (os.getenv("USER") ~= "root") and cfg.home.."/.luarocks" cfg.homeconfdir = cfg.home.."/.luarocks" -- cgit v1.2.3-55-g6feb