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

fish 2.4.0

Browse source 
Closes #6699.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
This commit is contained in:
David Adam 2016-11-08 11:58:02 +08:00 committed by Mike McQuaid
parent 452d73f790
commit 29df28e8dc
1 changed files with 4 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Formula/fish.rb
View file

@ -3,14 +3,9 @@ class Fish < Formula
homepage "https://fishshell.com"
stable do
url "https://fishshell.com/files/2.3.1/fish-2.3.1.tar.gz"
mirror "https://github.com/fish-shell/fish-shell/releases/download/2.3.1/fish-2.3.1.tar.gz"
sha256 "328acad35d131c94118c1e187ff3689300ba757c4469c8cc1eaa994789b98664"
# Skip extra dirs creation during install phase patch for current stable. To be removed on the next fish release.
# As discussed in https://github.com/Homebrew/homebrew-core/pull/2813
# Use part of https://github.com/fish-shell/fish-shell/commit/9abbc5f upstream commit and patch the makefile.
patch :DATA
url "https://fishshell.com/files/2.4.0/fish-2.4.0.tar.gz"
mirror "https://github.com/fish-shell/fish-shell/releases/download/2.4.0/fish-2.4.0.tar.gz"
sha256 "06bbb2323360439c4044da762d114ec1aa1aba265cec71c0543e6a0095c9efc5"
end
bottle do
@ -21,14 +16,6 @@ class Fish < Formula
sha256 "19fe34be078746b38b4b8bcf0f384c80963a6437587844116645ee1679e444bd" => :mavericks
end
devel do
url "https://github.com/fish-shell/fish-shell/releases/download/2.4b1/fish-2.4b1.tar.gz"
sha256 "36139e09064f7904d8b7de4603789c41c1a9bf425280494468948de61572cbbd"
depends_on "autoconf" => :build
depends_on "doxygen" => :build
end
head do
url "https://github.com/fish-shell/fish-shell.git", :shallow => false
@ -39,7 +26,7 @@ class Fish < Formula
depends_on "pcre2"
def install
system "autoconf" if build.head? || build.devel?
system "autoconf" if build.head?
# In Homebrew's 'superenv' sed's path will be incompatible, so
# the correct path is passed into configure here.
@ -75,18 +62,3 @@ class Fish < Formula
system "#{bin}/fish", "-c", "echo"
end
end
__END__
As discussed in https://github.com/Homebrew/homebrew-core/pull/2813
Grab part of https://github.com/fish-shell/fish-shell/commit/9abbc5f upstream commit and patch the makefile.
--- a/Makefile.in
+++ b/Makefile.in@@ -664,5 +664,5 @@ install-force: all install-translations
@@ -664,5 +664,5 @@ install-force: all install-translations
$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/completions
- $(INSTALL) -m 755 -d $(DESTDIR)$(extra_completionsdir)
- $(INSTALL) -m 755 -d $(DESTDIR)$(extra_functionsdir)
- $(INSTALL) -m 755 -d $(DESTDIR)$(extra_confdir)
+ $(INSTALL) -m 755 -d $(DESTDIR)$(extra_completionsdir); true
+ $(INSTALL) -m 755 -d $(DESTDIR)$(extra_functionsdir); true
+ $(INSTALL) -m 755 -d $(DESTDIR)$(extra_confdir); true
$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/functions