From 8c675a194ed8b038dcf3678d995aa87899282692 Mon Sep 17 00:00:00 2001
From: Thijs Schreijer <thijs@thijsschreijer.nl>
Date: Thu, 10 Oct 2013 08:45:28 +0200
Subject: fix paths for 5.2, escaping in installer and fix wrapper scripts

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

diff --git a/install.bat b/install.bat
index 8d8b3e4c..0f34276d 100644
--- a/install.bat
+++ b/install.bat
@@ -541,7 +541,7 @@ for _, c in ipairs{"luarocks", "luarocks-admin"} do
 @ECHO OFF
 SETLOCAL
 SET LUA_PATH=$LUADIR\?.lua;$LUADIR\?\init.lua;%LUA_PATH%
-IF NOT *%LUA_PATH_5_2%*==** (
+IF NOT "%LUA_PATH_5_2%"=="" (
    SET LUA_PATH_5_2=$LUADIR\?.lua;$LUADIR\?\init.lua;%LUA_PATH_5_2%
 )
 SET PATH=$BINDIR\;%PATH%
diff --git a/src/luarocks/fs/win32.lua b/src/luarocks/fs/win32.lua
index 2b5bb955..2bc595f6 100644
--- a/src/luarocks/fs/win32.lua
+++ b/src/luarocks/fs/win32.lua
@@ -71,7 +71,9 @@ function wrap_script(file, dest, name, version)
    wrapper:write("setlocal\n")
    wrapper:write('set LUA_PATH='..package.path..";%LUA_PATH%\n")
    wrapper:write('set LUA_CPATH='..package.cpath..";%LUA_CPATH%\n")
-   wrapper:write('"'..dir.path(cfg.variables["LUA_BINDIR"], cfg.lua_interpreter)..'" -lluarocks.loader -e\'luarocks.loader.add_context([['..name..']],[['..version..']])\' "'..file..'" %*\n')
+   wrapper:write('if not "%LUA_PATH_5_2%"=="" set LUA_PATH_5_2='..package.path..";%LUA_PATH_5_2%\n")
+   wrapper:write('if not "%LUA_CPATH_5_2%"=="" set LUA_CPATH_5_2='..package.cpath..";%LUA_CPATH_5_2%\n")
+   wrapper:write('"'..dir.path(cfg.variables["LUA_BINDIR"], cfg.lua_interpreter)..'" -lluarocks.loader -e"luarocks.loader.add_context([['..name..']],[['..version..']])" "'..file..'" %*\n')
    wrapper:write("endlocal\n")
    wrapper:close()
    return true
-- 
cgit v1.2.3-55-g6feb