diff options
Diffstat (limited to 'install.bat')
-rw-r--r-- | install.bat | 7 |
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 = {} | |||
8 | vars.PREFIX = nil | 8 | vars.PREFIX = nil |
9 | vars.VERSION = "3.0" | 9 | vars.VERSION = "3.0" |
10 | vars.SYSCONFDIR = nil | 10 | vars.SYSCONFDIR = nil |
11 | vars.SYSCONFFORCE = nil | ||
12 | vars.CONFBACKUPDIR = nil | 11 | vars.CONFBACKUPDIR = nil |
13 | vars.SYSCONFFILENAME = nil | 12 | vars.SYSCONFFILENAME = nil |
14 | vars.CONFIG_FILE = nil | 13 | vars.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" | |||
835 | vars.CONFIG_FILE = vars.SYSCONFDIR.."\\"..vars.SYSCONFFILENAME | 833 | vars.CONFIG_FILE = vars.SYSCONFDIR.."\\"..vars.SYSCONFFILENAME |
836 | if SELFCONTAINED then | 834 | if 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 |
841 | end | 838 | end |
@@ -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 | ]=]) |
1041 | if FORCE_CONFIG then | 1039 | if FORCE_CONFIG then |
1042 | f:write(" FORCE_CONFIG = true,\n") | 1040 | f:write(" FORCE_CONFIG = true,\n") |
1043 | end | 1041 | end |
1044 | if vars.SYSCONFFORCE then -- only write this value when explcitly given, otherwise rely on defaults | ||
1045 | f:write(S(" SYSCONFDIR = [[$SYSCONFDIR]],\n")) | ||
1046 | end | ||
1047 | f:write("}\n") | 1042 | f:write("}\n") |
1048 | f:close() | 1043 | f:close() |
1049 | print(S([[Created LuaRocks hardcoded settings file: $LUADIR\luarocks\core\hardcoded.lua]])) | 1044 | print(S([[Created LuaRocks hardcoded settings file: $LUADIR\luarocks\core\hardcoded.lua]])) |