diff options
| author | Hisham <hisham@gobolinux.org> | 2016-08-11 20:55:08 -0300 |
|---|---|---|
| committer | Hisham <hisham@gobolinux.org> | 2016-08-11 20:55:08 -0300 |
| commit | 5cdc22fb3c3a85160cd7c2d49ba10ab113e4a784 (patch) | |
| tree | f4b9544389da04045d40daec5d5bcbcaaac34bff | |
| parent | 36b0198c669e1fcbe706b371bb983e190decd664 (diff) | |
| download | luarocks-5cdc22fb3c3a85160cd7c2d49ba10ab113e4a784.tar.gz luarocks-5cdc22fb3c3a85160cd7c2d49ba10ab113e4a784.tar.bz2 luarocks-5cdc22fb3c3a85160cd7c2d49ba10ab113e4a784.zip | |
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.
| -rw-r--r-- | install.bat | 2 | ||||
| -rw-r--r-- | 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 | |||
| 993 | f:write("site_config.LUAROCKS_FORCE_CONFIG=true\n") | 993 | f:write("site_config.LUAROCKS_FORCE_CONFIG=true\n") |
| 994 | end | 994 | end |
| 995 | if vars.SYSCONFFORCE then -- only write this value when explcitly given, otherwise rely on defaults | 995 | if vars.SYSCONFFORCE then -- only write this value when explcitly given, otherwise rely on defaults |
| 996 | f:write(S("site_config.LUAROCKS_SYSCONFIG=[[$CONFIG_FILE]]\n")) | 996 | f:write(S("site_config.LUAROCKS_SYSCONFDIR=[[$SYSCONFDIR]]\n")) |
| 997 | end | 997 | end |
| 998 | f:write("return site_config\n") | 998 | f:write("return site_config\n") |
| 999 | f:close() | 999 | 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 @@ | |||
| 5 | -- file format documentation</a> for details. | 5 | -- file format documentation</a> for details. |
| 6 | -- | 6 | -- |
| 7 | -- End-users shouldn't edit this file. They can override any defaults | 7 | -- End-users shouldn't edit this file. They can override any defaults |
| 8 | -- set in this file using their system-wide $LUAROCKS_SYSCONFIG file | 8 | -- set in this file using their system-wide or user-specific configuration |
| 9 | -- (see luarocks.site_config) or their user-specific configuration file | 9 | -- files. Run `luarocks` with no arguments to see the locations of |
| 10 | -- (~/.luarocks/config.lua on Unix or %APPDATA%/luarocks/config.lua on | 10 | -- these files in your platform. |
| 11 | -- Windows). | ||
| 12 | 11 | ||
| 13 | local rawset, next, table, pairs, require, io, os, setmetatable, pcall, ipairs, package, tonumber, type, assert, _VERSION = | 12 | local rawset, next, table, pairs, require, io, os, setmetatable, pcall, ipairs, package, tonumber, type, assert, _VERSION = |
| 14 | rawset, next, table, pairs, require, io, os, setmetatable, pcall, ipairs, package, tonumber, type, assert, _VERSION | 13 | rawset, next, table, pairs, require, io, os, setmetatable, pcall, ipairs, package, tonumber, type, assert, _VERSION |
