From 5cdc22fb3c3a85160cd7c2d49ba10ab113e4a784 Mon Sep 17 00:00:00 2001 From: Hisham Date: Thu, 11 Aug 2016 20:55:08 -0300 Subject: Make behavior of config files on Windows more consistent with that on Unix. This was detected during the port of the new testsuite to Windows by @robooo. --- install.bat | 2 +- src/luarocks/cfg.lua | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/install.bat b/install.bat index dcd132ff..cc4a5257 100644 --- a/install.bat +++ b/install.bat @@ -993,7 +993,7 @@ if FORCE_CONFIG then f:write("site_config.LUAROCKS_FORCE_CONFIG=true\n") end if vars.SYSCONFFORCE then -- only write this value when explcitly given, otherwise rely on defaults - f:write(S("site_config.LUAROCKS_SYSCONFIG=[[$CONFIG_FILE]]\n")) + f:write(S("site_config.LUAROCKS_SYSCONFDIR=[[$SYSCONFDIR]]\n")) end f:write("return site_config\n") f:close() diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua index d58c7407..d84ebc6e 100644 --- a/src/luarocks/cfg.lua +++ b/src/luarocks/cfg.lua @@ -5,10 +5,9 @@ -- file format documentation for details. -- -- End-users shouldn't edit this file. They can override any defaults --- set in this file using their system-wide $LUAROCKS_SYSCONFIG file --- (see luarocks.site_config) or their user-specific configuration file --- (~/.luarocks/config.lua on Unix or %APPDATA%/luarocks/config.lua on --- Windows). +-- set in this file using their system-wide or user-specific configuration +-- files. Run `luarocks` with no arguments to see the locations of +-- these files in your platform. local rawset, next, table, pairs, require, io, os, setmetatable, pcall, ipairs, package, tonumber, type, assert, _VERSION = rawset, next, table, pairs, require, io, os, setmetatable, pcall, ipairs, package, tonumber, type, assert, _VERSION -- cgit v1.2.3-55-g6feb