6 files changed, 23 insertions, 5 deletions
diff --git a/install.bat b/install.bat
index 758c1efc..f6d6f842 100644
--- a/install.bat
+++ b/install.bat
@@ -738,8 +738,8 @@ rocks_trees = {
 if FORCE_CONFIG then
        f:write("    home..[[/luarocks]],\n")
 end
-f:write(S"    { name = [[system]], root = [[$ROCKS_TREE]] },\n")
 f:write(S"    { name = [[user]],   root = home..[[/luarocks]] },\n")
+f:write(S"    { name = [[system]], root = [[$ROCKS_TREE]] },\n")
 f:write("}\n")
 if vars.SCRIPTS_DIR then
        f:write(S"scripts_dir=[[$SCRIPTS_DIR]]\n")
diff --git a/src/luarocks/command_line.lua b/src/luarocks/command_line.lua
index 63b918b5..059b7a1c 100644
--- a/src/luarocks/command_line.lua
+++ b/src/luarocks/command_line.lua
@@ -61,6 +61,12 @@ function run_command(...)
   local command
   
+   if flags["verbose"] then   -- setting it in the config file will kick-in earlier in the process
+      cfg.verbose = true
+      local fs = require("luarocks.fs")
+      fs.verbose()
+   end
   if flags["version"] then
      util.printout(program.." "..cfg.program_version)
      util.printout(program_description)
diff --git a/src/luarocks/dir.lua b/src/luarocks/dir.lua
index 3c7465bb..e8cd746e 100644
--- a/src/luarocks/dir.lua
+++ b/src/luarocks/dir.lua
@@ -64,6 +64,14 @@ function split_url(url)
   return protocol, pathname
 end
+--- Normalize a url or local path.
+-- URLs should be in the "protocol://path" format. System independent
+-- forward slashes are used, removing trailing and double slashes
+-- @param url string: an URL or a local pathname.
+-- @return string: Normalized result.
 function normalize(name)
-   return name:gsub("\\", "/"):gsub("(.)/*$", "%1")
+   local protocol, pathname = split_url(name)
+   pathname = pathname:gsub("\\", "/"):gsub("(.)/*$", "%1"):gsub("//", "/")
+   if protocol ~= "file" then pathname = protocol .."://"..pathname end
+   return pathname
 end
diff --git a/src/luarocks/fs.lua b/src/luarocks/fs.lua
index 2d799da2..b281eb14 100644
--- a/src/luarocks/fs.lua
+++ b/src/luarocks/fs.lua
@@ -14,7 +14,9 @@ local cfg = require("luarocks.cfg")
 local pack = table.pack or function(...) return { n = select("#", ...), ... } end
 local unpack = table.unpack or unpack
-if cfg.verbose then -- patch io.popen and os.execute to display commands in verbose mode
+local old_popen, old_exec
+_M.verbose = function()    -- patch io.popen and os.execute to display commands in verbose mode
+  if old_popen or old_exec then return end
  old_popen = io.popen
  io.popen = function(one, two)
    if two == nil then
@@ -36,6 +38,7 @@ if cfg.verbose then -- patch io.popen and os.execute to display commands in verb
    return unpack(code, 1, code.n)    
  end
 end
+if cfg.verbose then _M.verbose() end
 local function load_fns(fs_table)
   for name, fn in pairs(fs_table) do
diff --git a/src/luarocks/search.lua b/src/luarocks/search.lua
index 356e06e8..76ea6815 100644
--- a/src/luarocks/search.lua
+++ b/src/luarocks/search.lua
@@ -305,6 +305,7 @@ function print_results(results, porcelain)
      end
      for version, repos in util.sortedpairs(versions, deps.compare_versions) do
         for _, repo in ipairs(repos) do
+            repo.repo = dir.normalize(repo.repo)
            if porcelain then
               util.printout(package, version, repo.arch, repo.repo)
            else
diff --git a/win32/bin/luarocksw.bat b/win32/bin/luarocksw.bat
index 313508d4..8ac02920 100644
--- a/win32/bin/luarocksw.bat
+++ b/win32/bin/luarocksw.bat
@@ -34,14 +34,14 @@ if [%1]==[removeall] goto REMOVEALL
 REM execute LuaRocks and wait for results
 echo executing: luarocks %*
-call %MYPATH%luarocks %*
+call "%MYPATH%luarocks" %*
 pause
 goto END
 :REMOVEALL
 for /f "delims=-" %%a in ("%~n2") do (
    echo executing: luarocks remove %%a
-    %MYPATH%luarocks remove "%%a"
+    "%MYPATH%luarocks" remove "%%a"
    pause
    goto END
 )