1 files changed, 20 insertions, 7 deletions

diff --git a/src/luarocks/install.lua b/src/luarocks/install.lua
index e99b4ce0..0a779b86 100644
--- a/src/luarocks/install.lua
+++ b/src/luarocks/install.lua
@@ -23,9 +23,10 @@ or a filename of a locally available rock.
 
 --- Install a binary rock.
 -- @param rock_file string: local or remote filename of a rock.
+-- @param no_deps boolean: true if dependency check needs to be skipped
 -- @return boolean or (nil, string, [string]): True if succeeded or 
 -- nil and an error message and an optional error code.
-function install_binary_rock(rock_file)
+function install_binary_rock(rock_file, no_deps)
    assert(type(rock_file) == "string")
 
    local name, version, arch = path.parse_name(rock_file)
@@ -53,8 +54,12 @@ function install_binary_rock(rock_file)
       return nil, "Failed loading rockspec for installed package: "..err, errcode
    end
 
-   ok, err, errcode = deps.check_external_deps(rockspec, "install")
-   if err then return nil, err, errcode end
+   if no_deps then
+      util.printerr("Warning: skipping dependency checks.")
+   else
+      ok, err, errcode = deps.check_external_deps(rockspec, "install")
+      if err then return nil, err, errcode end
+   end
 
    -- For compatibility with .rock files built with LuaRocks 1
    if not fs.exists(path.rock_manifest_file(name, version)) then
@@ -62,10 +67,17 @@ function install_binary_rock(rock_file)
       if err then return nil, err end
    end
 
-   ok, err, errcode = deps.fulfill_dependencies(rockspec)
-   if err then return nil, err, errcode end
+   if not no_deps then
+      ok, err, errcode = deps.fulfill_dependencies(rockspec)
+      if err then return nil, err, errcode end
+   end
+
+   local wrap_bin_scripts = true
+   if rockspec.deploy and rockspec.deploy.wrap_bin_scripts == false then
+      wrap_bin_scripts = false
+   end
 
-   ok, err = rep.deploy_files(name, version)
+   ok, err = rep.deploy_files(name, version, rep.should_wrap_bin_scripts(rockspec))
    if err then return nil, err end
 
    util.remove_scheduled_function(rollback)
@@ -112,10 +124,11 @@ function run(...)
    if not ok then return nil, err end
 
    if name:match("%.rockspec$") or name:match("%.src%.rock$") then
+      util.printout("Using "..name.."... switching to 'build' mode")
       local build = require("luarocks.build")
       return build.run(name, flags["local"] and "--local")
    elseif name:match("%.rock$") then
-      return install_binary_rock(name)
+      return install_binary_rock(name, flags["nodeps"])
    else
       local search = require("luarocks.search")
       local results, err = search.find_suitable_rock(search.make_query(name:lower(), version))