diff options
Diffstat (limited to '')
-rw-r--r-- | install.bat | 7 | ||||
-rw-r--r-- | src/luarocks/cfg.lua | 2 | ||||
-rw-r--r-- | src/luarocks/command_line.lua | 5 |
3 files changed, 12 insertions, 2 deletions
diff --git a/install.bat b/install.bat index f5692c6e..8e3df4d9 100644 --- a/install.bat +++ b/install.bat | |||
@@ -8,6 +8,7 @@ local vars = {} | |||
8 | vars.PREFIX = nil | 8 | vars.PREFIX = nil |
9 | vars.VERSION = "2.2" | 9 | vars.VERSION = "2.2" |
10 | vars.SYSCONFDIR = nil | 10 | vars.SYSCONFDIR = nil |
11 | vars.SYSCONFFORCE = nil | ||
11 | vars.CONFBACKUPDIR = nil | 12 | vars.CONFBACKUPDIR = nil |
12 | vars.SYSCONFFILENAME = nil | 13 | vars.SYSCONFFILENAME = nil |
13 | vars.CONFIG_FILE = nil | 14 | vars.CONFIG_FILE = nil |
@@ -208,6 +209,7 @@ local function parse_options(args) | |||
208 | vars.PREFIX = option.value | 209 | vars.PREFIX = option.value |
209 | elseif name == "/CONFIG" then | 210 | elseif name == "/CONFIG" then |
210 | vars.SYSCONFDIR = option.value | 211 | vars.SYSCONFDIR = option.value |
212 | vars.SYSCONFFORCE = true | ||
211 | elseif name == "/TREE" then | 213 | elseif name == "/TREE" then |
212 | vars.TREE_ROOT = option.value | 214 | vars.TREE_ROOT = option.value |
213 | elseif name == "/SCRIPTS" then | 215 | elseif name == "/SCRIPTS" then |
@@ -775,6 +777,7 @@ vars.SYSCONFFILENAME = S"config-$LUA_VERSION.lua" | |||
775 | vars.CONFIG_FILE = vars.SYSCONFDIR.."\\"..vars.SYSCONFFILENAME | 777 | vars.CONFIG_FILE = vars.SYSCONFDIR.."\\"..vars.SYSCONFFILENAME |
776 | if SELFCONTAINED then | 778 | if SELFCONTAINED then |
777 | vars.SYSCONFDIR = vars.PREFIX | 779 | vars.SYSCONFDIR = vars.PREFIX |
780 | vars.SYSCONFFORCE = true | ||
778 | vars.TREE_ROOT = vars.PREFIX..[[\systree]] | 781 | vars.TREE_ROOT = vars.PREFIX..[[\systree]] |
779 | REGISTRY = false | 782 | REGISTRY = false |
780 | end | 783 | end |
@@ -971,7 +974,6 @@ else | |||
971 | end | 974 | end |
972 | f:write(S[=[ | 975 | f:write(S[=[ |
973 | site_config.LUAROCKS_UNAME_M=[[$UNAME_M]] | 976 | site_config.LUAROCKS_UNAME_M=[[$UNAME_M]] |
974 | site_config.LUAROCKS_SYSCONFIG=[[$CONFIG_FILE]] | ||
975 | site_config.LUAROCKS_ROCKS_TREE=[[$TREE_ROOT]] | 977 | site_config.LUAROCKS_ROCKS_TREE=[[$TREE_ROOT]] |
976 | site_config.LUAROCKS_PREFIX=[[$PREFIX]] | 978 | site_config.LUAROCKS_PREFIX=[[$PREFIX]] |
977 | site_config.LUAROCKS_DOWNLOADER=[[wget]] | 979 | site_config.LUAROCKS_DOWNLOADER=[[wget]] |
@@ -980,6 +982,9 @@ site_config.LUAROCKS_MD5CHECKER=[[md5sum]] | |||
980 | if FORCE_CONFIG then | 982 | if FORCE_CONFIG then |
981 | f:write("site_config.LUAROCKS_FORCE_CONFIG=true\n") | 983 | f:write("site_config.LUAROCKS_FORCE_CONFIG=true\n") |
982 | end | 984 | end |
985 | if vars.SYSCONFFORCE then -- only write this value when explcitly given, otherwise rely on defaults | ||
986 | f:write("site_config.LUAROCKS_SYSCONFIG=[[$CONFIG_FILE]]\n") | ||
987 | end | ||
983 | f:write("return site_config\n") | 988 | f:write("return site_config\n") |
984 | f:close() | 989 | f:close() |
985 | print(S([[Created LuaRocks site-config file: $LUADIR\luarocks\]]..site_config..[[.lua]])) | 990 | print(S([[Created LuaRocks site-config file: $LUADIR\luarocks\]]..site_config..[[.lua]])) |
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua index a22cf121..e41b632c 100644 --- a/src/luarocks/cfg.lua +++ b/src/luarocks/cfg.lua | |||
@@ -149,7 +149,7 @@ local sys_config_file_default, home_config_file_default | |||
149 | local sys_config_dir, home_config_dir | 149 | local sys_config_dir, home_config_dir |
150 | local sys_config_ok, home_config_ok = false, false | 150 | local sys_config_ok, home_config_ok = false, false |
151 | local extra_luarocks_module_dir | 151 | local extra_luarocks_module_dir |
152 | sys_config_dir = site_config.LUAROCKS_SYSCONFDIR | 152 | sys_config_dir = site_config.LUAROCKS_SYSCONFDIR or site_config.LUAROCKS_PREFIX |
153 | if cfg.platforms.windows then | 153 | if cfg.platforms.windows then |
154 | cfg.home = os.getenv("APPDATA") or "c:" | 154 | cfg.home = os.getenv("APPDATA") or "c:" |
155 | sys_config_dir = sys_config_dir or "c:/luarocks" | 155 | sys_config_dir = sys_config_dir or "c:/luarocks" |
diff --git a/src/luarocks/command_line.lua b/src/luarocks/command_line.lua index dbf64b9c..e1c9f492 100644 --- a/src/luarocks/command_line.lua +++ b/src/luarocks/command_line.lua | |||
@@ -31,12 +31,17 @@ end | |||
31 | local function replace_tree(flags, args, tree) | 31 | local function replace_tree(flags, args, tree) |
32 | tree = dir.normalize(tree) | 32 | tree = dir.normalize(tree) |
33 | flags["tree"] = tree | 33 | flags["tree"] = tree |
34 | local added = false | ||
34 | for i = 1, #args do | 35 | for i = 1, #args do |
35 | if args[i]:match("%-%-tree=") then | 36 | if args[i]:match("%-%-tree=") then |
36 | args[i] = "--tree="..tree | 37 | args[i] = "--tree="..tree |
38 | added = true | ||
37 | break | 39 | break |
38 | end | 40 | end |
39 | end | 41 | end |
42 | if not added then | ||
43 | args[#args + 1] = "--tree="..tree | ||
44 | end | ||
40 | path.use_tree(tree) | 45 | path.use_tree(tree) |
41 | end | 46 | end |
42 | 47 | ||