diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2014-05-03 16:46:09 -0300 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2014-05-03 16:46:09 -0300 |
commit | dca17835db0ed60f971acf33a0c78d203bc5e22f (patch) | |
tree | 0da9487442b9d942c3216dd77d2e5e9a4a09f206 /install.bat | |
parent | 63820f899cf8f35b2274b04e76b15b168213bd33 (diff) | |
parent | 2501f311c8b9311a3e48787ba955ab6b4e783c7f (diff) | |
download | luarocks-dca17835db0ed60f971acf33a0c78d203bc5e22f.tar.gz luarocks-dca17835db0ed60f971acf33a0c78d203bc5e22f.tar.bz2 luarocks-dca17835db0ed60f971acf33a0c78d203bc5e22f.zip |
Merge branch 'master' of https://github.com/keplerproject/luarocks
Conflicts:
src/luarocks/fs/unix/tools.lua
src/luarocks/fs/win32/tools.lua
Diffstat (limited to 'install.bat')
-rw-r--r-- | install.bat | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/install.bat b/install.bat index 93b159a5..6dc8cd02 100644 --- a/install.bat +++ b/install.bat | |||
@@ -707,7 +707,7 @@ IF NOT "%LUA_PATH_5_3%"=="" ( | |||
707 | SET "LUA_PATH_5_3=$LUADIR\?.lua;$LUADIR\?\init.lua;%LUA_PATH_5_3%" | 707 | SET "LUA_PATH_5_3=$LUADIR\?.lua;$LUADIR\?\init.lua;%LUA_PATH_5_3%" |
708 | ) | 708 | ) |
709 | SET "PATH=$BINDIR;%PATH%" | 709 | SET "PATH=$BINDIR;%PATH%" |
710 | "$LUA_INTERPRETER" "$BINDIR\]]..c..[[.lua" %* | 710 | "$LUA_BINDIR\$LUA_INTERPRETER" "$BINDIR\]]..c..[[.lua" %* |
711 | IF NOT "%ERRORLEVEL%"=="2" GOTO EXITLR | 711 | IF NOT "%ERRORLEVEL%"=="2" GOTO EXITLR |
712 | 712 | ||
713 | REM Permission denied error, try and auto elevate... | 713 | REM Permission denied error, try and auto elevate... |