From be03328e54d4f233e2ce64f9b99f921264bd0eeb Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Wed, 22 Sep 2010 21:57:24 -0300 Subject: Replace wget with curl in Windows --- install.bat | 2 +- win32/bin/curl.exe | Bin 0 -> 590336 bytes win32/bin/wget.exe | Bin 252416 -> 0 bytes 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 win32/bin/curl.exe delete mode 100755 win32/bin/wget.exe 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/win32/bin/curl.exe b/win32/bin/curl.exe new file mode 100644 index 00000000..d57dcc92 Binary files /dev/null and b/win32/bin/curl.exe differ diff --git a/win32/bin/wget.exe b/win32/bin/wget.exe deleted file mode 100755 index c7e47a73..00000000 Binary files a/win32/bin/wget.exe and /dev/null differ -- cgit v1.2.3-55-g6feb From d0d848ad3bd364993e4c8f933c14075f4c91b126 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Thu, 23 Sep 2010 15:47:02 -0300 Subject: New option for ~/.luarocks/config.lua: "local_by_default", which implies --local in all commands (useful for my test setup here). --- src/luarocks/command_line.lua | 4 ++++ 1 file changed, 4 insertions(+) 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=") -- cgit v1.2.3-55-g6feb