Merge branch 'master' of github.com:keplerproject/luarocks

4 files changed, 5 insertions, 1 deletions

diff --git a/install.bat b/install.bat
index 09d96b8c..4a1bf78a 100644
--- a/install.bat
+++ b/install.bat
@@ -284,7 +284,7 @@ ECHO LUAROCKS_UNAME_M=[[x86]]>> "%LUADIR%\luarocks\config.lua"
 ECHO LUAROCKS_SYSCONFIG=[[%SYSCONFDIR%/config.lua]]>> "%LUADIR%\luarocks\config.lua" 

 ECHO LUAROCKS_ROCKS_TREE=[[%ROCKS_TREE%]]>> "%LUADIR%\luarocks\config.lua" 

 ECHO LUAROCKS_PREFIX=[[%PREFIX%]]>> "%LUADIR%\luarocks\config.lua" 

-ECHO LUAROCKS_DOWNLOADER=[[wget]]>> "%LUADIR%\luarocks\config.lua"

+ECHO LUAROCKS_DOWNLOADER=[[curl]]>> "%LUADIR%\luarocks\config.lua"

 ECHO LUAROCKS_MD5CHECKER=[[md5sum]]>> "%LUADIR%\luarocks\config.lua"

 IF NOT [%FORCE_CONFIG%]==[] ECHO local LUAROCKS_FORCE_CONFIG=true>> "%LUADIR%\luarocks\config.lua"

 TYPE "%LUADIR%\luarocks\config.lua.bak">> "%LUADIR%\luarocks\config.lua" 

diff --git a/src/luarocks/command_line.lua b/src/luarocks/command_line.lua
index 71ded87d..8b74a65f 100644
--- a/src/luarocks/command_line.lua
+++ b/src/luarocks/command_line.lua
@@ -88,6 +88,10 @@ function run_command(...)
    end
    command = command:gsub("-", "_")
    
+   if cfg.local_by_default then
+      flags["local"] = true
+   end
+   
    if flags["to"] then
       if flags["to"] == true then
          die("Argument error: use --to=<path>")
diff --git a/win32/bin/curl.exe b/win32/bin/curl.exe
new file mode 100644
index 00000000..d57dcc92
--- /dev/null
+++ b/win32/bin/curl.exe
diff --git a/win32/bin/wget.exe b/win32/bin/wget.exe
deleted file mode 100755
index c7e47a73..00000000
--- a/win32/bin/wget.exe
+++ /dev/null