4 files changed, 20 insertions, 5 deletions

diff --git a/src/luarocks/build/builtin.lua b/src/luarocks/build/builtin.lua
index e0f1c848..853b0361 100644
--- a/src/luarocks/build/builtin.lua
+++ b/src/luarocks/build/builtin.lua
@@ -240,8 +240,8 @@ function run(rockspec)
    end
    if ok then
       if fs.is_dir("lua") then
-         ok = fs.copy_contents("lua", luadir)
-         if not ok then err = "Failed copying contents of 'lua' directory." end
+         ok, err = fs.copy_contents("lua", luadir)
+         if not ok then err = "Failed copying contents of 'lua' directory: "..err end
       end
    end
    if ok then
diff --git a/src/luarocks/path.lua b/src/luarocks/path.lua
index 64a203ef..2ce0e078 100644
--- a/src/luarocks/path.lua
+++ b/src/luarocks/path.lua
@@ -37,11 +37,19 @@ end
 
 function root_dir(rocks_dir)
    assert(type(rocks_dir) == "string")
-   
    local suffix = dir.path("lib", "luarocks")
    return rocks_dir:match("(.*)" .. suffix .. ".*$")
 end
 
+function rocks_tree_to_string(tree)
+   if type(tree) == "string" then
+      return tree
+   else
+      assert(type(tree) == "table")
+      return tree.root
+   end
+end
+
 function deploy_bin_dir(tree)
    if type(tree) == "string" then
       return dir.path(tree, "bin")
diff --git a/src/luarocks/remove.lua b/src/luarocks/remove.lua
index 126cfdc8..8c899a0a 100644
--- a/src/luarocks/remove.lua
+++ b/src/luarocks/remove.lua
@@ -87,6 +87,13 @@ function run(...)
    
    local ok, err = fs.check_command_permissions(flags)
    if not ok then return nil, err end
+   
+   local rock_type = name:match("%.(rock)$") or name:match("%.(rockspec)$")
+   local filename = name
+   if rock_type then
+      name, version = path.parse_name(filename)
+      if not name then return nil, "Invalid "..rock_type.." filename: "..filename end
+   end
 
    local results = {}
    search.manifest_search(results, cfg.rocks_dir, search.make_query(name, version))
diff --git a/src/luarocks/show.lua b/src/luarocks/show.lua
index 7849934d..a6a53d9a 100644
--- a/src/luarocks/show.lua
+++ b/src/luarocks/show.lua
@@ -115,7 +115,7 @@ function run(...)
    if not manifest then return nil,err end
    local minfo = manifest.repository[name][version][1]
 
-   if flags["rock-tree"] then util.printout(repo)
+   if flags["rock-tree"] then util.printout(path.rocks_tree_to_string(repo))
    elseif flags["rock-dir"] then util.printout(directory)
    elseif flags["home"] then util.printout(descript.homepage)
    elseif flags["modules"] then util.printout(keys_as_string(minfo.modules))
@@ -136,7 +136,7 @@ function run(...)
       if descript.homepage then
          util.printout("Homepage: ", descript.homepage)
       end
-      util.printout("Installed in: ", repo)
+      util.printout("Installed in: ", path.rocks_tree_to_string(repo))
       if next(minfo.modules) then
          util.printout()
          util.printout("Modules:")