From 45b5a1e2a7cbdadfa57f9b895cacc162eff9211c Mon Sep 17 00:00:00 2001
From: Hisham Muhammad <hisham@gobolinux.org>
Date: Wed, 19 Sep 2012 20:21:39 -0300
Subject: Do not use Lua modules tools while on Windows. Should help with #42.
 Any feedback is welcome.

---
 src/luarocks/cfg.lua    |  3 +++
 src/luarocks/fs/lua.lua | 19 ++++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index e0b4060a..c904a7ba 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -162,6 +162,7 @@ local defaults = {
    local_by_default = false,
    use_extensions = false,
    accept_unknown_fields = false,
+   fs_use_modules = true,
 
    lua_modules_path = "/share/lua/"..lua_version,
    lib_modules_path = "/lib/lua/"..lua_version,
@@ -240,6 +241,7 @@ local defaults = {
 
 if detected.windows then
    home_config_file = home_config_file:gsub("\\","/")
+   defaults.fs_use_modules = false
    defaults.arch = "win32-"..proc
    defaults.platforms = {"win32", "windows" }
    defaults.lib_extension = "dll"
@@ -278,6 +280,7 @@ end
 
 if detected.mingw32 then
    home_config_file = home_config_file:gsub("\\","/")
+   defaults.fs_use_modules = false
    defaults.arch = "win32-"..proc
    defaults.platforms = { "win32", "mingw32" }
    defaults.lib_extension = "dll"
diff --git a/src/luarocks/fs/lua.lua b/src/luarocks/fs/lua.lua
index 2231dde5..c413ccb3 100644
--- a/src/luarocks/fs/lua.lua
+++ b/src/luarocks/fs/lua.lua
@@ -10,13 +10,18 @@ local dir = require("luarocks.dir")
 local util = require("luarocks.util")
 local path = require("luarocks.path")
 
-local socket_ok, http = pcall(require, "socket.http")
-local _, ftp = pcall(require, "socket.ftp")
-local zip_ok, lrzip = pcall(require, "luarocks.tools.zip")
-local unzip_ok, luazip = pcall(require, "zip"); _G.zip = nil
-local lfs_ok, lfs = pcall(require, "lfs")
-local md5_ok, md5 = pcall(require, "md5")
-local posix_ok, posix = pcall(require, "posix")
+local socket_ok, zip_ok, unzip_ok, lfs_ok, md5_ok, posix_ok, _
+local http, ftp, lrzip, luazip, lfs, md5, posix
+
+if cfg.fs_use_modules then
+   socket_ok, http = pcall(require, "socket.http")
+   _, ftp = pcall(require, "socket.ftp")
+   zip_ok, lrzip = pcall(require, "luarocks.tools.zip")
+   unzip_ok, luazip = pcall(require, "zip"); _G.zip = nil
+   lfs_ok, lfs = pcall(require, "lfs")
+   md5_ok, md5 = pcall(require, "md5")
+   posix_ok, posix = pcall(require, "posix")
+end
 
 local tar = require("luarocks.tools.tar")
 local patch = require("luarocks.tools.patch")
-- 
cgit v1.2.3-55-g6feb