diff options
| author | Thijs Schreijer <thijs@thijsschreijer.nl> | 2013-12-03 14:49:55 +0100 |
|---|---|---|
| committer | Thijs Schreijer <thijs@thijsschreijer.nl> | 2013-12-03 14:49:55 +0100 |
| commit | 4e94b656e0e9a555d3bf0086c32b18b2b4a6f965 (patch) | |
| tree | deda59036f546553e9d6fb98f6be72986ec8532d | |
| parent | 16af24817fafbd7d199c1e9f2f6a1e87320de5d9 (diff) | |
| parent | 4f9ee18078fcd6b1fd810630b1e86f2b63fe17b8 (diff) | |
| download | luarocks-4e94b656e0e9a555d3bf0086c32b18b2b4a6f965.tar.gz luarocks-4e94b656e0e9a555d3bf0086c32b18b2b4a6f965.tar.bz2 luarocks-4e94b656e0e9a555d3bf0086c32b18b2b4a6f965.zip | |
Merge branch 'master' of https://github.com/keplerproject/luarocks into proper_win_defaults
Diffstat (limited to '')
| -rw-r--r-- | install.bat | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/install.bat b/install.bat index 39043f9a..47395831 100644 --- a/install.bat +++ b/install.bat | |||
| @@ -406,7 +406,7 @@ local function look_for_lua_install () | |||
| 406 | then | 406 | then |
| 407 | if get_runtime() then | 407 | if get_runtime() then |
| 408 | print("Runtime check completed, now testing interpreter...") | 408 | print("Runtime check completed, now testing interpreter...") |
| 409 | if exec(S[[$LUA_BINDIR\$LUA_INTERPRETER -v 2>NUL]]) then | 409 | if exec(S[["$LUA_BINDIR\$LUA_INTERPRETER" -v 2>NUL]]) then |
| 410 | print(" Ok") | 410 | print(" Ok") |
| 411 | return true | 411 | return true |
| 412 | end | 412 | end |
| @@ -427,7 +427,7 @@ local function look_for_lua_install () | |||
| 427 | print("Headers found, checking runtime to use...") | 427 | print("Headers found, checking runtime to use...") |
| 428 | if get_runtime() then | 428 | if get_runtime() then |
| 429 | print("Runtime check completed, now testing interpreter...") | 429 | print("Runtime check completed, now testing interpreter...") |
| 430 | if exec(S[[$LUA_BINDIR\$LUA_INTERPRETER -v 2>NUL]]) then | 430 | if exec(S[["$LUA_BINDIR\$LUA_INTERPRETER" -v 2>NUL]]) then |
| 431 | print(" Ok") | 431 | print(" Ok") |
| 432 | return true | 432 | return true |
| 433 | end | 433 | end |
| @@ -804,7 +804,7 @@ LuaRocks; | |||
| 804 | PATH : $FULL_PREFIX | 804 | PATH : $FULL_PREFIX |
| 805 | LUA_PATH : $FULL_PREFIX\lua\?.lua;$FULL_PREFIX\lua\?\init.lua | 805 | LUA_PATH : $FULL_PREFIX\lua\?.lua;$FULL_PREFIX\lua\?\init.lua |
| 806 | Local user rocktree (Note: %APPDATA% is user dependent); | 806 | Local user rocktree (Note: %APPDATA% is user dependent); |
| 807 | PATH : %APPDATA%\LuaRock\bin | 807 | PATH : %APPDATA%\LuaRocks\bin |
| 808 | LUA_PATH : %APPDATA%\LuaRocks\share\lua\$LUA_VERSION\?.lua;%APPDATA%\LuaRocks\share\lua\$LUA_VERSION\?\init.lua | 808 | LUA_PATH : %APPDATA%\LuaRocks\share\lua\$LUA_VERSION\?.lua;%APPDATA%\LuaRocks\share\lua\$LUA_VERSION\?\init.lua |
| 809 | LUA_CPATH: %APPDATA%\LuaRocks\lib\lua\$LUA_VERSION\?.dll | 809 | LUA_CPATH: %APPDATA%\LuaRocks\lib\lua\$LUA_VERSION\?.dll |
| 810 | System rocktree | 810 | System rocktree |