Update riak to install most files privately.

Riak does not need its "lib" folder linked into the PREFIX,
so we install all of Riak privately to "libexec" and then link
in the control scripts in "bin".

1 files changed, 13 insertions, 7 deletions

diff --git a/Library/Formula/riak.rb b/Library/Formula/riak.rb
index 7a998d99d..79fd72b60 100644
--- a/Library/Formula/riak.rb
+++ b/Library/Formula/riak.rb
@@ -7,20 +7,26 @@ class Riak <Formula
   homepage 'http://riak.basho.com'
   md5 'ff745b0c9a52b8741256602afae22a09'
   
-  skip_clean 'log'
-  skip_clean 'log/sasl'
-  skip_clean 'data'
-  skip_clean 'data/dets'
-  skip_clean 'data/ring'
+  skip_clean 'libexec/log'
+  skip_clean 'libexec/log/sasl'
+  skip_clean 'libexec/data'
+  skip_clean 'libexec/data/dets'
+  skip_clean 'libexec/data/ring'
   
   def install
     ENV.deparallelize
     system "make all rel"
     %w(riak riak-admin).each do |file|
       inreplace "rel/riak/bin/#{file}", /^RUNNER_SCRIPT_DIR.+$/, ""
-      inreplace "rel/riak/bin/#{file}", /^RUNNER_BASE_DIR=.+$/, "RUNNER_BASE_DIR=#{prefix}"
+      inreplace "rel/riak/bin/#{file}", /^RUNNER_BASE_DIR=.+$/, "RUNNER_BASE_DIR=#{libexec}"
     end
-    system "mv rel/riak/* #{prefix}"
+
+    # Install most files to private libexec, and link in the binaries.
+    libexec.install Dir["rel/riak/*"]
+    bin.mkpath
+    ln_s libexec+'bin/riak', bin
+    ln_s libexec+'bin/riak-admin', bin
+
     (prefix + 'data/ring').mkpath
     (prefix + 'data/dets').mkpath
   end