From e39fdd0e377c32f853dc0488023914aa9deecee3 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sun, 15 Apr 2012 22:27:51 -0500 Subject: redis: style nits - The doc directory no longer exists, and was triggering a warning about a no-op install. Signed-off-by: Jack Nagel --- Library/Formula/redis.rb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'Library') 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 -- cgit v1.2.3