From 11b8b48978118e5cc4e30f63274c63245cecb6ef Mon Sep 17 00:00:00 2001
From: Thijs Schreijer <thijs@thijsschreijer.nl>
Date: Tue, 5 May 2015 12:25:25 +0200
Subject: fixes #365

---
 install.bat               | 5 +++--
 src/luarocks/fs/win32.lua | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/install.bat b/install.bat
index 52d21355..ffde28db 100644
--- a/install.bat
+++ b/install.bat
@@ -729,7 +729,8 @@ IF NOT "%LUA_PATH_5_3%"=="" (
 )
 SET "PATH=$BINDIR;%PATH%"
 "$LUA_BINDIR\$LUA_INTERPRETER" "$BINDIR\]]..c..[[.lua" %*
-IF NOT "%ERRORLEVEL%"=="2" GOTO EXITLR
+SET EXITCODE=%ERRORLEVEL%
+IF NOT "%EXITCODE%"=="2" GOTO EXITLR
 
 REM Permission denied error, try and auto elevate...
 REM already an admin? (checking to prevent loops)
@@ -758,7 +759,7 @@ ECHO Now retrying as a priviledged user...
 PowerShell -Command (New-Object -com 'Shell.Application').ShellExecute('%TMPFILE%', '', '', 'runas')
 
 :EXITLR
-ENDLOCAL
+exit /b %EXITCODE% 
 ]])
 	f:close()
 	print(S"Created LuaRocks command: $BINDIR\\"..c..".bat")
diff --git a/src/luarocks/fs/win32.lua b/src/luarocks/fs/win32.lua
index 12d86d1d..32766e53 100644
--- a/src/luarocks/fs/win32.lua
+++ b/src/luarocks/fs/win32.lua
@@ -125,6 +125,7 @@ function win32.wrap_script(file, dest, name, version)
    local ppaths = "package.path="..util.LQ(lpath..";").."..package.path; package.cpath="..util.LQ(lcpath..";").."..package.cpath"
    local addctx = "local k,l,_=pcall(require,"..util.LQ("luarocks.loader")..") _=k and l.add_context("..util.LQ(name)..","..util.LQ(version)..")"
    wrapper:write(fs.Qb(lua)..' -e '..fs.Qb(ppaths)..' -e '..fs.Qb(addctx)..' '..fs.Qb(file)..' %*\n')
+   wrapper:write("exit /b %ERRORLEVEL%\n")
    wrapper:close()
    return true
 end
-- 
cgit v1.2.3-55-g6feb