Merge pull request Homebrew#236528 from Homebrew/zookeeper-remove-postinstall

zookeeper: remove postinstall

Author: BrewTestBot

Formula/z/zookeeper.rb

@@ -8,13 +8,14 @@ class Zookeeper < Formula
   head "https://gitbox.apache.org/repos/asf/zookeeper.git", branch: "master"
 
   bottle do
-    sha256 cellar: :any,                 arm64_sequoia: "30629ea6bd355a58883b9c2ddcdc668f69182d52c3bb774ccf6c4e75688655d7"
-    sha256 cellar: :any,                 arm64_sonoma:  "e5809bf957d3ecec8a72e0a04c40cd4f34b2c975ed3381458d3b86871534675c"
-    sha256 cellar: :any,                 arm64_ventura: "5ba8b90990e86cf729f8bef03183669f27f9552d94d3dae476885dfabd6bc5f2"
-    sha256 cellar: :any,                 sonoma:        "b368084f2a77fd9c80ebeec0aad7d1b06dced3786277645dffa886adaf44b67b"
-    sha256 cellar: :any,                 ventura:       "199fff017e82f333837bf56be5b4cc9fb2ea160c2345faa45dd83f5a783e2f52"
-    sha256 cellar: :any_skip_relocation, arm64_linux:   "40165048822d3639182b202d18b054c354b4c44604a37d613706f1af322a2d4d"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:  "bca9ec36841d6380a78c00a666711f4ae3814f786dcf9d613722e1061866d343"
+    rebuild 1
+    sha256 cellar: :any,                 arm64_sequoia: "c043dd88af99227da093e9ef7a1136c3312aad202434a400b72aaefffdca1ded"
+    sha256 cellar: :any,                 arm64_sonoma:  "c0589e76ede2fd9ba0e3b72cfc76a8cfaf8a532eb6cc5444a1758de771cdef4d"
+    sha256 cellar: :any,                 arm64_ventura: "753fb3e9dc9010f36e650e1314ed958b3e8ffcbf05eaa99c1bb4aa666dc85ca0"
+    sha256 cellar: :any,                 sonoma:        "7ee73700ab93a4c025d257cd971bda6ef2529d628209f432b2ca14194cc7aa4b"
+    sha256 cellar: :any,                 ventura:       "3b229907351bb11466ccf04ffa41d92f514d16f155842f5735ba9c4c8d0ada9b"
+    sha256 cellar: :any_skip_relocation, arm64_linux:   "ccad26bf750b09df6f7f3a4291360a1a3d172e295d7c8360a60a05e6dea8f4b3"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:  "241acb246366f78df065cba11917cc41845b185c520ca0632d5bf14d03c505db"
   end
 
   depends_on "autoconf" => :build
@@ -27,22 +28,13 @@ class Zookeeper < Formula
   depends_on "openjdk"
   depends_on "openssl@3"
 
-  resource "default_logback_xml" do
-    url "https://raw.githubusercontent.com/apache/zookeeper/release-3.9.4/conf/logback.xml"
-    sha256 "2fae7f51e4f92e8e3536e5f9ac193cb0f4237d194b982bb00b5c8644389c901f"
-  end
-
   def default_zk_env
     <<~EOS
-      [ -z "$ZOOCFGDIR" ] && export ZOOCFGDIR="#{etc}/zookeeper"
+      [ -z "$ZOOCFGDIR" ] && export ZOOCFGDIR="#{pkgetc}"
     EOS
   end
 
   def install
-    if build.stable? && version != resource("default_logback_xml").version
-      odie "default_logback_xml resource needs to be updated"
-    end
-
     system "mvn", "install", "-Pfull-build", "-DskipTests"
 
     system "tar", "-xf", "zookeeper-assembly/target/apache-zookeeper-#{version}-bin.tar.gz"
@@ -55,8 +47,6 @@ def install
     include.install Dir[libpfx+"/usr/include/*"]
     lib.install Dir[libpfx+"/usr/lib/*"]
 
-    bin.mkpath
-    (etc/"zookeeper").mkpath
     (var/"log/zookeeper").mkpath
     (var/"run/zookeeper/data").mkpath
 
@@ -68,30 +58,20 @@ def install
       (bin+bin_name).write <<~EOS
         #!/bin/bash
         export JAVA_HOME="${JAVA_HOME:-#{Formula["openjdk"].opt_prefix}}"
-        . "#{etc}/zookeeper/defaults"
+        . "#{pkgetc}/defaults"
         exec "#{libexec}/bin/#{script_name}" "$@"
       EOS
     end
 
+    (buildpath/"defaults").write(default_zk_env)
+    cp "conf/logback.xml", "logback.xml"
     cp "conf/zoo_sample.cfg", "conf/zoo.cfg"
     inreplace "conf/zoo.cfg",
               /^dataDir=.*/, "dataDir=#{var}/run/zookeeper/data"
-    (etc/"zookeeper").install "conf/zoo.cfg"
-
+    pkgetc.install "conf/zoo.cfg", "defaults", "logback.xml"
     (pkgshare/"examples").install "conf/logback.xml", "conf/zoo_sample.cfg"
   end
 
-  def post_install
-    tmpdir = Pathname.new(Dir.mktmpdir)
-    tmpdir.install resource("default_logback_xml")
-
-    defaults = etc/"zookeeper/defaults"
-    defaults.write(default_zk_env) unless defaults.exist?
-
-    logback_xml = etc/"zookeeper/logback.xml"
-    logback_xml.write(tmpdir/"default_logback_xml") unless logback_xml.exist?
-  end
-
   service do
     run [opt_bin/"zkServer", "start-foreground"]
     environment_variables SERVER_JVMFLAGS: "-Dapple.awt.UIElement=true"
@@ -101,6 +81,6 @@ def post_install
 
   test do
     output = shell_output("#{bin}/zkServer -h 2>&1")
-    assert_match "Using config: #{etc}/zookeeper/zoo.cfg", output
+    assert_match "Using config: #{pkgetc}/zoo.cfg", output
   end
 end