3 files changed, 22 insertions, 33 deletions

diff --git a/src/luarocks/fs/lua.lua b/src/luarocks/fs/lua.lua
index d75bb476..1cae25f4 100644
--- a/src/luarocks/fs/lua.lua
+++ b/src/luarocks/fs/lua.lua
@@ -578,7 +578,26 @@ end
 
 if posix_ok then
 
+local octal_to_rwx = {
+   ["0"] = "---",
+   ["1"] = "--x",
+   ["2"] = "-w-",
+   ["3"] = "-wx",
+   ["4"] = "r--",
+   ["5"] = "r-x",
+   ["6"] = "rw-",
+   ["7"] = "rwx",
+}
+
 function chmod(file, mode)
+   -- LuaPosix (as of 5.1.15) does not support octal notation...
+   if mode:sub(1,1) == "0" then
+      local new_mode = {}
+      for c in mode:sub(2):gmatch(".") do
+         table.insert(new_mode, octal_to_rwx[c])
+      end
+      mode = table.concat(new_mode)
+   end
    local err = posix.chmod(file, mode)
    return err == 0
 end
diff --git a/src/luarocks/fs/unix.lua b/src/luarocks/fs/unix.lua
index 262cb3d0..979fd166 100644
--- a/src/luarocks/fs/unix.lua
+++ b/src/luarocks/fs/unix.lua
@@ -54,7 +54,7 @@ function wrap_script(file, dest)
    wrapper:write('export LUA_PATH LUA_CPATH\n')
    wrapper:write('exec "'..dir.path(cfg.variables["LUA_BINDIR"], cfg.lua_interpreter)..'" -lluarocks.loader "'..file..'" "$@"\n')
    wrapper:close()
-   if fs.execute("chmod +x",wrapname) then
+   if fs.chmod(wrapname, "0755") then
       return true
    else
       return nil, "Could not make "..wrapname.." executable."
@@ -74,35 +74,6 @@ function is_actual_binary(filename)
    if file then
       local found = false
       local first = file:read()
-      if first:match("#!.*lua") then
-         found = true
-      elseif first:match("#!/bin/sh") then
-         local line = file:read()
-         line = file:read()
-         if not(line and line:match("LUA_PATH")) then
-            found = true
-         end
-      end
-      file:close()
-      if found then
-         return false
-      else
-         return true
-      end
-   else
-      return true
-   end
-   return false
-end
-
-function is_actual_binary(filename)
-   if filename:match("%.lua$") then
-      return false
-   end
-   local file = io.open(filename)
-   if file then
-      local found = false
-      local first = file:read()
       if not first then
          file:close()
          util.printerr("Warning: could not read "..filename)
@@ -127,6 +98,5 @@ function is_actual_binary(filename)
 end
 
 function copy_binary(filename, dest) 
-   -- LuaPosix (as of 5.1.15) does not support octal notation...
-   return fs.copy(filename, dest, "u=rwx,g=rx,o=rx")
+   return fs.copy(filename, dest, "0755")
 end
diff --git a/src/luarocks/fs/unix/tools.lua b/src/luarocks/fs/unix/tools.lua
index 5e91439b..d6d60adc 100644
--- a/src/luarocks/fs/unix/tools.lua
+++ b/src/luarocks/fs/unix/tools.lua
@@ -101,7 +101,7 @@ function copy(src, dest, perm)
          if fs.is_dir(dest) then
             dest = dir.path(dest, dir.base_name(src))
          end
-         if fs.execute(vars.CHMOD, perm, dest) then
+         if fs.chmod(dest, perm) then
             return true
          else
             return false, "Failed setting permissions of "..dest