Skip to content

Commit 1e935d6

Browse files
committed
zookeeper: remove postinstall
1 parent 22a45bd commit 1e935d6

File tree

1 file changed

+6
-27
lines changed

1 file changed

+6
-27
lines changed

Formula/z/zookeeper.rb

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,13 @@ class Zookeeper < Formula
2727
depends_on "openjdk"
2828
depends_on "openssl@3"
2929

30-
resource "default_logback_xml" do
31-
url "https://raw.githubusercontent.com/apache/zookeeper/release-3.9.4/conf/logback.xml"
32-
sha256 "2fae7f51e4f92e8e3536e5f9ac193cb0f4237d194b982bb00b5c8644389c901f"
33-
end
34-
3530
def default_zk_env
3631
<<~EOS
37-
[ -z "$ZOOCFGDIR" ] && export ZOOCFGDIR="#{etc}/zookeeper"
32+
[ -z "$ZOOCFGDIR" ] && export ZOOCFGDIR="#{pkgetc}"
3833
EOS
3934
end
4035

4136
def install
42-
if build.stable? && version != resource("default_logback_xml").version
43-
odie "default_logback_xml resource needs to be updated"
44-
end
45-
4637
system "mvn", "install", "-Pfull-build", "-DskipTests"
4738

4839
system "tar", "-xf", "zookeeper-assembly/target/apache-zookeeper-#{version}-bin.tar.gz"
@@ -55,8 +46,6 @@ def install
5546
include.install Dir[libpfx+"/usr/include/*"]
5647
lib.install Dir[libpfx+"/usr/lib/*"]
5748

58-
bin.mkpath
59-
(etc/"zookeeper").mkpath
6049
(var/"log/zookeeper").mkpath
6150
(var/"run/zookeeper/data").mkpath
6251

@@ -68,30 +57,20 @@ def install
6857
(bin+bin_name).write <<~EOS
6958
#!/bin/bash
7059
export JAVA_HOME="${JAVA_HOME:-#{Formula["openjdk"].opt_prefix}}"
71-
. "#{etc}/zookeeper/defaults"
60+
. "#{pkgetc}/defaults"
7261
exec "#{libexec}/bin/#{script_name}" "$@"
7362
EOS
7463
end
7564

65+
(buildpath/"defaults").write(default_zk_env)
66+
cp "conf/logback.xml", "logback.xml"
7667
cp "conf/zoo_sample.cfg", "conf/zoo.cfg"
7768
inreplace "conf/zoo.cfg",
7869
/^dataDir=.*/, "dataDir=#{var}/run/zookeeper/data"
79-
(etc/"zookeeper").install "conf/zoo.cfg"
80-
70+
pkgetc.install "conf/zoo.cfg", "defaults", "logback.xml"
8171
(pkgshare/"examples").install "conf/logback.xml", "conf/zoo_sample.cfg"
8272
end
8373

84-
def post_install
85-
tmpdir = Pathname.new(Dir.mktmpdir)
86-
tmpdir.install resource("default_logback_xml")
87-
88-
defaults = etc/"zookeeper/defaults"
89-
defaults.write(default_zk_env) unless defaults.exist?
90-
91-
logback_xml = etc/"zookeeper/logback.xml"
92-
logback_xml.write(tmpdir/"default_logback_xml") unless logback_xml.exist?
93-
end
94-
9574
service do
9675
run [opt_bin/"zkServer", "start-foreground"]
9776
environment_variables SERVER_JVMFLAGS: "-Dapple.awt.UIElement=true"
@@ -101,6 +80,6 @@ def post_install
10180

10281
test do
10382
output = shell_output("#{bin}/zkServer -h 2>&1")
104-
assert_match "Using config: #{etc}/zookeeper/zoo.cfg", output
83+
assert_match "Using config: #{pkgetc}/zoo.cfg", output
10584
end
10685
end

0 commit comments

Comments
 (0)