From 12e6e2618fedcdcf8fe5d0b6858f09aeebc990f1 Mon Sep 17 00:00:00 2001
From: Thijs Schreijer <thijs@thijsschreijer.nl>
Date: Thu, 19 Dec 2013 23:09:50 +0100
Subject: 1. bug fix for installing on x64 systems in "program files (x86)"
 (parentheses around x86 gave some escaping problems) 2. Adds named trees
 created by windows installer in the config file.

---
 install.bat | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/install.bat b/install.bat
index 280d361f..758c1efc 100644
--- a/install.bat
+++ b/install.bat
@@ -640,11 +640,11 @@ for _, c in ipairs{"luarocks", "luarocks-admin"} do
 	f:write(S[[
 @ECHO OFF
 SETLOCAL
-SET LUA_PATH=$LUADIR\?.lua;$LUADIR\?\init.lua;%LUA_PATH%
+SET "LUA_PATH=$LUADIR\?.lua;$LUADIR\?\init.lua;%LUA_PATH%"
 IF NOT "%LUA_PATH_5_2%"=="" (
-   SET LUA_PATH_5_2=$LUADIR\?.lua;$LUADIR\?\init.lua;%LUA_PATH_5_2%
+   "SET LUA_PATH_5_2=$LUADIR\?.lua;$LUADIR\?\init.lua;%LUA_PATH_5_2%"
 )
-SET PATH=$BINDIR\;%PATH%
+SET "PATH=$BINDIR;%PATH%"
 "$LUA_INTERPRETER" "$BINDIR\]]..c..[[.lua" %*
 ENDLOCAL
 ]])
@@ -738,7 +738,8 @@ rocks_trees = {
 if FORCE_CONFIG then
 	f:write("    home..[[/luarocks]],\n")
 end
-f:write(S"    [[$ROCKS_TREE]]\n")
+f:write(S"    { name = [[system]], root = [[$ROCKS_TREE]] },\n")
+f:write(S"    { name = [[user]],   root = home..[[/luarocks]] },\n")
 f:write("}\n")
 if vars.SCRIPTS_DIR then
 	f:write(S"scripts_dir=[[$SCRIPTS_DIR]]\n")
-- 
cgit v1.2.3-55-g6feb