aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
authorAdam Vandenberg2012-02-28 21:29:26 -0800
committerAdam Vandenberg2012-02-28 21:29:26 -0800
commitf7f96a830e7fb5b6346a56ca3792c7d129c21a41 (patch)
treef9e3b8a0e5504d35ce0105ac07b652b2af102105 /Library/Formula
parentfaa75efaaab4c01b1da8f353bfafa07c093e972d (diff)
downloadhomebrew-f7f96a830e7fb5b6346a56ca3792c7d129c21a41.tar.bz2
LuaRocks 2.0.7.1
Removed caveats, since they applied to a now-old upgrade of the formula.
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/luarocks.rb16
1 files changed, 5 insertions, 11 deletions
diff --git a/Library/Formula/luarocks.rb b/Library/Formula/luarocks.rb
index 54a66c5b2..a16071ad2 100644
--- a/Library/Formula/luarocks.rb
+++ b/Library/Formula/luarocks.rb
@@ -3,9 +3,9 @@ require 'formula'
def use_luajit?; ARGV.include? '--with-luajit'; end
class Luarocks < Formula
- url 'http://luarocks.org/releases/luarocks-2.0.4.1.tar.gz'
homepage 'http://luarocks.org'
- md5 '2c7caccce3cdf236e6f9aca7bec9bdea'
+ url 'http://luarocks.org/releases/luarocks-2.0.7.1.tar.gz'
+ md5 '37003e5c78792e353acde684426bdeac'
depends_on use_luajit? ? 'luajit' : 'lua'
@@ -32,16 +32,10 @@ class Luarocks < Formula
system "./configure", *args
system "make"
+ ENV.j1 # 2.0.4.1 worked in parallel but 2.0.7.1 does not
system "make install"
end
- def caveats; <<-EOS.undent
- Luarocks now "just works" but this means any rocks you installed previously
- will need to be moved from `lib/luarocks/lib/luarocks` to `lib/luarocks`.
- You'll probably have a better time of it all if you just reinstall them.
- EOS
- end
-
def test
opoo "Luarocks test script installs 'lpeg'"
system "#{bin}/luarocks install lpeg"
@@ -50,7 +44,7 @@ class Luarocks < Formula
end
-# this patch because we set the permissions of /usr/local to root owned
+# This patch because we set the permissions of /usr/local to root owned
# not user writable to be "good" citizens of /usr/local. Actually LUA is being
# pedantic since all the directories it wants under /usr/local are writable
# so we just return true. Naughty, but I don't know LUA and don't want to
@@ -65,7 +59,7 @@ index 3a547fe..ca4ddc5 100644
-- plus an error message.
function check_command_permissions(flags)
- local root_dir = path.root_dir(cfg.rocks_dir)
-- if not flags["local"] and not fs.is_writable(root_dir) then
+- if not flags["local"] and not (fs.is_writable(root_dir) or fs.is_writable(dir.dir_name(root_dir))) then
- return nil, "Your user does not have write permissions in " .. root_dir ..
- " \n-- you may want to run as a privileged user or use your local tree with --local."
- end