wbrawner/homebrew-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

findutils: remove default-names option

Browse source
This commit is contained in:
FX Coudert 2019-01-05 11:39:00 +01:00
parent 184d559d6c
commit 8c4f31e664
1 changed files with 20 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
Formula/findutils.rb
View file

@ -13,10 +13,6 @@ class Findutils < Formula
sha256 "bc20b7e2a97c3277ea13fd91b44fbc0015628e8684a2bba203c38a4c7357f6c7" => :el_capitan
end
option "with-default-names", "Do not prepend 'g' to the binary"
deprecated_option "default-names" => "with-default-names"
def install
# Work around unremovable, nested dirs bug that affects lots of
# GNU projects. See:
@ -31,29 +27,26 @@ class Findutils < Formula
--localstatedir=#{var}/locate
--disable-dependency-tracking
--disable-debug
--program-prefix=g
]
args << "--program-prefix=g" if build.without? "default-names"
system "./configure", *args
system "make", "install"
# https://savannah.gnu.org/bugs/index.php?46846
# https://github.com/Homebrew/homebrew/issues/47791
updatedb = (build.with?("default-names") ? "updatedb" : "gupdatedb")
(libexec/"bin").install bin/updatedb
(bin/updatedb).write <<~EOS
(libexec/"bin").install bin/"gupdatedb"
(bin/"gupdatedb").write <<~EOS
#!/bin/sh
export LC_ALL='C'
exec "#{libexec}/bin/#{updatedb}" "$@"
exec "#{libexec}/bin/gupdatedb" "$@"
EOS
if build.without? "default-names"
[[prefix, bin], [share, man/"*"]].each do |base, path|
Dir[path/"g*"].each do |p|
f = Pathname.new(p)
gnupath = "gnu" + f.relative_path_from(base).dirname
(libexec/gnupath).install_symlink f => f.basename.sub(/^g/, "")
end
[[prefix, bin], [share, man/"*"]].each do |base, path|
Dir[path/"g*"].each do |p|
f = Pathname.new(p)
gnupath = "gnu" + f.relative_path_from(base).dirname
(libexec/gnupath).install_symlink f => f.basename.sub(/^g/, "")
end
end
end
@ -62,28 +55,21 @@ class Findutils < Formula
(var/"locate").mkpath
end
def caveats
if build.without? "default-names"
<<~EOS
All commands have been installed with the prefix 'g'.
If you do not want the prefix, install using the "with-default-names" option.
def caveats; <<~EOS
All commands have been installed with the prefix "g".
If you need to use these commands with their normal names, you
can add a "gnubin" directory to your PATH from your bashrc like:
PATH="#{opt_libexec}/gnubin:$PATH"
If you need to use these commands with their normal names, you
can add a "gnubin" directory to your PATH from your bashrc like:
PATH="#{opt_libexec}/gnubin:$PATH"
Additionally, you can access their man pages with normal names if you add
the "gnuman" directory to your MANPATH from your bashrc as well:
MANPATH="#{opt_libexec}/gnuman:$MANPATH"
EOS
end
Additionally, you can access their man pages with normal names if you add
the "gnuman" directory to your MANPATH from your bashrc as well:
MANPATH="#{opt_libexec}/gnuman:$MANPATH"
EOS
end
test do
find = (build.with?("default-names") ? "find" : "gfind")
touch "HOMEBREW"
assert_match "HOMEBREW", shell_output("#{bin}/#{find} .")
assert_match "HOMEBREW", shell_output("#{bin}/gfind .")
assert_match "HOMEBREW", shell_output("#{opt_libexec}/gnubin/find .")
end
end