From 206a7dfb9b059f05d2c64b071648381b5eb82d0d Mon Sep 17 00:00:00 2001 From: Don Hardman Date: Mon, 6 Mar 2023 14:41:40 +0700 Subject: [PATCH 1/2] Try to use plist_options and update versions of manticore search and buddy --- Formula/manticore-buddy.rb | 10 ++-------- Formula/manticoresearch.rb | 16 +++++++--------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/Formula/manticore-buddy.rb b/Formula/manticore-buddy.rb index bb9cdac..1787686 100644 --- a/Formula/manticore-buddy.rb +++ b/Formula/manticore-buddy.rb @@ -3,18 +3,12 @@ class ManticoreBuddy < Formula desc "Manticore Search's sidecar which helps it with various tasks" homepage "https://github.com/manticoresoftware/manticoresearch-buddy" - url "https://github.com/manticoresoftware/manticoresearch-buddy.git", revision: "3db8cfb80855bcc939315db2e415836b18bcf999" - version "0.3.5-2023020315-3db8cfb" + url "https://github.com/manticoresoftware/manticoresearch-buddy.git", revision: "2276e89a7bfad03b2104b421429c673e0e0a70a8" + version "0.3.7-2023030220-2276e89" license "GPL-2.0" version_scheme 1 head "https://github.com/manticoresoftware/manticoresearch-buddy.git" - bottle do - root_url "https://github.com/manticoresoftware/homebrew-manticore/releases/download/manticore-buddy-0.3.5-2023020315-3db8cfb" - sha256 cellar: :any_skip_relocation, monterey: "1a26d87cc2fc62ad5eddbe13cb0db68ad5802bbc4f8c4cfa6a2bfe7119ed5e43" - sha256 cellar: :any_skip_relocation, big_sur: "8fb9c016af684082e0abfae1fc294307b29c434537276205d0e5e78bad9c1277" - end - depends_on "composer" => :build depends_on "php" => :build depends_on "php" => :test diff --git a/Formula/manticoresearch.rb b/Formula/manticoresearch.rb index 2571405..42751b2 100644 --- a/Formula/manticoresearch.rb +++ b/Formula/manticoresearch.rb @@ -1,18 +1,12 @@ class Manticoresearch < Formula desc "Open source database for search" homepage "https://www.manticoresearch.com" - url "https://github.com/manticoresoftware/manticoresearch.git", revision: "68cfcea87fe38e4610a7f72e7dbf3f956fdb53e8" - version "6.0.1-2023020323-68cfcea" - license "GPL-2.0" + url "https://github.com/manticoresoftware/manticoresearch.git", revision: "b471e62d5d47c633cf6c13a3084398f86dde6b78" + version "6.0.3-2023030613-b471e62" + license "GPL-2.0-or-later" version_scheme 1 head "https://github.com/manticoresoftware/manticoresearch.git" - bottle do - root_url "https://github.com/manticoresoftware/homebrew-manticore/releases/download/manticoresearch-6.0.1-2023020323-68cfcea" - sha256 monterey: "92a01f30450fae577752f5df8af719263487fb22b491b250d09ee1e013f501c2" - sha256 big_sur: "0e61c1d18d633b09ef8a00e084d68bc61e4d30dc3aed64e6ab52b3eac8c8dbaf" - end - depends_on "boost" => :build depends_on "cmake" => :build depends_on "icu4c" @@ -66,6 +60,10 @@ def post_install working_dir HOMEBREW_PREFIX end + def plist_options + { manual: "ulimit -n 10000" } + end + test do (testpath/"manticore.conf").write <<~EOS searchd { From 01acf784055b66faaf2d4a63778a55073a5d9ba6 Mon Sep 17 00:00:00 2001 From: Don Hardman Date: Mon, 6 Mar 2023 21:45:25 +0700 Subject: [PATCH 2/2] Simplify building to fix issue with extracting PHAR on osx and update backup version --- Formula/manticore-backup.rb | 15 +++++---------- Formula/manticore-buddy.rb | 3 ++- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Formula/manticore-backup.rb b/Formula/manticore-backup.rb index 6a1204f..2673693 100644 --- a/Formula/manticore-backup.rb +++ b/Formula/manticore-backup.rb @@ -1,25 +1,20 @@ class ManticoreBackup < Formula desc "Official tool for backups of Manticore Search" homepage "https://github.com/manticoresoftware/manticoresearch-backup" - url "https://github.com/manticoresoftware/manticoresearch-backup.git", revision: "4a3793286c03860ce1b0c46ebee6c6f58a1948de" - version "0.5.3-2023020315-4a37932" - license "GPL-2.0" + url "https://github.com/manticoresoftware/manticoresearch-backup.git", revision: "d2c86cbd3b812ce36a04123412d65c783ca8e8a9" + version "0.5.3-2023030313-d2c86cb" + license "GPL-2.0-or-later" version_scheme 1 head "https://github.com/manticoresoftware/manticoresearch-backup.git" - bottle do - root_url "https://github.com/manticoresoftware/homebrew-manticore/releases/download/manticore-backup-0.5.3-2023020315-4a37932" - sha256 cellar: :any_skip_relocation, monterey: "e3ce54fa79298143fbc8d90ad448aa87348bf074ba238ac995e1829db7a8020e" - sha256 cellar: :any_skip_relocation, big_sur: "99174f3aa63587302cc64f07c0d0566ca6744fdb9f0760f4a17c88bdd9e536e7" - end - depends_on "composer" => :build depends_on "php" => :build depends_on "php" => :test def install build_dir = `pwd`.strip + "/build" - system "./bin/build", "--name=\"Manticore Backup\"", "--package=manticore-backup", "--index=src/main.php" + system "git", "clone", "https://github.com/manticoresoftware/phar_builder.git" + system "./phar_builder/bin/build", "--name=\"Manticore Backup\"", "--package=manticore-backup", "--index=src/main.php" bin.install "#{build_dir}/manticore-backup" => "manticore-backup" end diff --git a/Formula/manticore-buddy.rb b/Formula/manticore-buddy.rb index 1787686..f773d82 100644 --- a/Formula/manticore-buddy.rb +++ b/Formula/manticore-buddy.rb @@ -16,7 +16,8 @@ class ManticoreBuddy < Formula def install build_dir = `pwd`.strip + "/build" - system "./bin/build", "--name=\"Manticore Buddy\"", "--package=manticore-buddy", "--index=src/main.php" + system "git", "clone", "https://github.com/manticoresoftware/phar_builder.git" + system "./phar_builder/bin/build", "--name=\"Manticore Buddy\"", "--package=manticore-buddy", "--index=src/main.php" dir = share mkdir_p "#{dir}/manticore/modules" mv "#{build_dir}/manticore-buddy", "#{dir}/manticore/modules/manticore-buddy"