aboutsummaryrefslogtreecommitdiff
path: root/install.bat
diff options
context:
space:
mode:
Diffstat (limited to 'install.bat')
-rw-r--r--install.bat7
1 files changed, 1 insertions, 6 deletions
diff --git a/install.bat b/install.bat
index 43b18e1d..e1053a52 100644
--- a/install.bat
+++ b/install.bat
@@ -8,7 +8,6 @@ local vars = {}
8vars.PREFIX = nil 8vars.PREFIX = nil
9vars.VERSION = "3.0" 9vars.VERSION = "3.0"
10vars.SYSCONFDIR = nil 10vars.SYSCONFDIR = nil
11vars.SYSCONFFORCE = nil
12vars.CONFBACKUPDIR = nil 11vars.CONFBACKUPDIR = nil
13vars.SYSCONFFILENAME = nil 12vars.SYSCONFFILENAME = nil
14vars.CONFIG_FILE = nil 13vars.CONFIG_FILE = nil
@@ -197,7 +196,6 @@ local function parse_options(args)
197 vars.PREFIX = option.value 196 vars.PREFIX = option.value
198 elseif name == "/CONFIG" then 197 elseif name == "/CONFIG" then
199 vars.SYSCONFDIR = option.value 198 vars.SYSCONFDIR = option.value
200 vars.SYSCONFFORCE = true
201 elseif name == "/TREE" then 199 elseif name == "/TREE" then
202 vars.TREE_ROOT = option.value 200 vars.TREE_ROOT = option.value
203 elseif name == "/SCRIPTS" then 201 elseif name == "/SCRIPTS" then
@@ -835,7 +833,6 @@ vars.SYSCONFFILENAME = S"config-$LUA_VERSION.lua"
835vars.CONFIG_FILE = vars.SYSCONFDIR.."\\"..vars.SYSCONFFILENAME 833vars.CONFIG_FILE = vars.SYSCONFDIR.."\\"..vars.SYSCONFFILENAME
836if SELFCONTAINED then 834if SELFCONTAINED then
837 vars.SYSCONFDIR = vars.PREFIX 835 vars.SYSCONFDIR = vars.PREFIX
838 vars.SYSCONFFORCE = true
839 vars.TREE_ROOT = vars.PREFIX..[[\systree]] 836 vars.TREE_ROOT = vars.PREFIX..[[\systree]]
840 REGISTRY = false 837 REGISTRY = false
841end 838end
@@ -1036,14 +1033,12 @@ return {
1036 SYSTEM = [[$SYSTEM]], 1033 SYSTEM = [[$SYSTEM]],
1037 PROCESSOR = [[$UNAME_M]], 1034 PROCESSOR = [[$UNAME_M]],
1038 PREFIX = [[$PREFIX]], 1035 PREFIX = [[$PREFIX]],
1036 SYSCONFDIR = [[$SYSCONFDIR]],
1039 WIN_TOOLS = [[$PREFIX/tools]], 1037 WIN_TOOLS = [[$PREFIX/tools]],
1040]=]) 1038]=])
1041if FORCE_CONFIG then 1039if FORCE_CONFIG then
1042 f:write(" FORCE_CONFIG = true,\n") 1040 f:write(" FORCE_CONFIG = true,\n")
1043end 1041end
1044if vars.SYSCONFFORCE then -- only write this value when explcitly given, otherwise rely on defaults
1045 f:write(S(" SYSCONFDIR = [[$SYSCONFDIR]],\n"))
1046end
1047f:write("}\n") 1042f:write("}\n")
1048f:close() 1043f:close()
1049print(S([[Created LuaRocks hardcoded settings file: $LUADIR\luarocks\core\hardcoded.lua]])) 1044print(S([[Created LuaRocks hardcoded settings file: $LUADIR\luarocks\core\hardcoded.lua]]))