aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
authorJack Nagel2012-04-15 22:27:51 -0500
committerJack Nagel2012-04-15 22:28:40 -0500
commite39fdd0e377c32f853dc0488023914aa9deecee3 (patch)
tree310608354cb976d2377c36825c7874bd1f35710d /Library/Formula
parent4d66bf8b991bb51e986b99cd8e40a734fb32ef83 (diff)
downloadhomebrew-e39fdd0e377c32f853dc0488023914aa9deecee3.tar.bz2
redis: style nits
- The doc directory no longer exists, and was triggering a warning about a no-op install. Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/redis.rb10
1 files changed, 3 insertions, 7 deletions
diff --git a/Library/Formula/redis.rb b/Library/Formula/redis.rb
index e02d5f9d6..22512a2ee 100644
--- a/Library/Formula/redis.rb
+++ b/Library/Formula/redis.rb
@@ -17,14 +17,11 @@ class Redis < Formula
ENV["OBJARCH"] = MacOS.prefer_64_bit? ? "-arch x86_64" : "-arch i386"
# Head and stable have different code layouts
- src = File.exists?('src/Makefile') ? 'src' : '.'
+ src = (buildpath/'src/Makefile').exist? ? buildpath/'src' : buildpath
system "make -C #{src}"
- %w( redis-benchmark redis-cli redis-server redis-check-dump redis-check-aof ).each { |p|
- bin.install "#{src}/#{p}" rescue nil
- }
-
- %w( run db/redis log ).each { |p| (var+p).mkpath }
+ %w[benchmark cli server check-dump check-aof].each { |p| bin.install src/"redis-#{p}" }
+ %w[run db/redis log].each { |p| (var+p).mkpath }
# Fix up default conf file to match our paths
inreplace "redis.conf" do |s|
@@ -33,7 +30,6 @@ class Redis < Formula
s.gsub! "\# bind 127.0.0.1", "bind 127.0.0.1"
end
- doc.install Dir["doc/*"]
etc.install "redis.conf"
plist_path.write startup_plist
plist_path.chmod 0644