admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Revert "Update brew tap to work without 'homebrew-'"

Browse Source 
This reverts commit d72901f92b7385d44d8c980976db6a4336572e7e.

References Homebrew/homebrew#18366.
Closes Homebrew/homebrew#18432.
This commit is contained in:
Mike McQuaid 2013-03-12 17:53:34 +00:00
parent 10d5ed56f1
commit c2e642f9c1
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Library/Homebrew/cmd/tap.rb
View File

@ -24,21 +24,7 @@ module Homebrew extend self
# we downcase to avoid case-insensitive filesystem issues # we downcase to avoid case-insensitive filesystem issues
tapd = HOMEBREW_LIBRARY/"Taps/#{user.downcase}-#{repo.downcase}" tapd = HOMEBREW_LIBRARY/"Taps/#{user.downcase}-#{repo.downcase}"
raise "Already tapped!" if tapd.directory? raise "Already tapped!" if tapd.directory?
# First try tapping the repo name as is. If that fails, fall back to abort unless system "git clone https://github.com/#{repouser}/homebrew-#{repo} #{tapd}"
# 'homebrew-repo'.
stdout = `git clone https://github.com/#{repouser}/#{repo} #{tapd} 2>/dev/null`
unless $?.success?
stdout = `git clone https://github.com/#{repouser}/homebrew-#{repo} #{tapd} 2>&1`
if $?.success?
repo = "homebrew-" + repo
else
abort <<-EOS.undent
Neither #{repouser}/#{repo} nor #{repouser}/homebrew-#{repo} tapped.
Please check the tap name and try again.
EOS
end
end
puts stdout
files = [] files = []
tapd.find_formula{ |file| files << tapd.basename.join(file) } tapd.find_formula{ |file| files << tapd.basename.join(file) }
@ -48,7 +34,7 @@ module Homebrew extend self
# Figure out if this repo is private # Figure out if this repo is private
# curl will throw an exception if the repo is private (Github returns a 404) # curl will throw an exception if the repo is private (Github returns a 404)
begin begin
curl('-Ifso', '/dev/null', "https://api.github.com/repos/#{repouser}/#{repo}") curl('-Ifso', '/dev/null', "https://api.github.com/repos/#{repouser}/homebrew-#{repo}")
rescue rescue
puts puts
puts "It looks like you tapped a private repository" puts "It looks like you tapped a private repository"
@ -57,7 +43,7 @@ module Homebrew extend self
puts "following command:" puts "following command:"
puts puts
puts " cd #{tapd}" puts " cd #{tapd}"
puts " git remote set-url origin git@github.com:#{repouser}/#{repo}.git" puts " git remote set-url origin git@github.com:#{repouser}/homebrew-#{repo}.git"
puts puts
end end
end end
@ -116,7 +102,7 @@ module Homebrew extend self
private private
def tap_args def tap_args
ARGV.first =~ %r{^(\S+)/(homebrew-)?([-\w]+)$} ARGV.first =~ %r{^(\S+)/(homebrew-)?(\w+)$}
raise "Invalid usage" unless $1 and $3 raise "Invalid usage" unless $1 and $3
[$1, $3] [$1, $3]
end end