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

Don't break if symlink already exists during tap

Browse Source 
This shouldn't happen but is possible and we should handle it.

Also added some puts when tapping/untapping.
This commit is contained in:
Max Howell 2012-03-16 17:11:40 +00:00
parent 0f02354073
commit 919f36717c
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,24 +19,33 @@ module Homebrew extend self
files = []
tapd.find_formula{ |file| files << Pathname.new("#{user}-#{repo}").join(file) }
link_tap_formula(files)
tapped = link_tap_formula(files)
puts "Tapped #{tapped} formula"
end
def link_tap_formula formulae
ignores = (HOMEBREW_LIBRARY/"Formula/.gitignore").read.split rescue []
tapped = 0
cd HOMEBREW_LIBRARY/"Formula" do
formulae.each do |formula|
from = HOMEBREW_LIBRARY.join("Taps/#{formula}").tap_ref
to = HOMEBREW_LIBRARY.join("Formula/#{formula.basename}").tap_ref
# Unexpected, but possible, lets proceed as if nothing happened
formula.delete if from == to
# using the system ln is the only way to get relative symlinks
system "ln -s ../Taps/#{formula} 2>/dev/null"
if $?.success?
ignores << formula.basename.to_s
tapped += 1
else
from = Pathname.new("../Taps").join(formula).tap_ref
to = HOMEBREW_LIBRARY.join("Formula/#{formula.basename}").tap_ref
opoo "Could not tap #{Tty.white}#{from}#{Tty.reset} over #{Tty.white}#{to}#{Tty.reset}"
end
end
tapped
end
HOMEBREW_LIBRARY.join("Formula/.gitignore").atomic_write(ignores.uniq.join("\n"))
@ -55,13 +64,13 @@ end
class Pathname
def tap_ref
case self.realpath.to_s
case self.to_s
when %r{^#{HOMEBREW_LIBRARY}/Taps/(\w+)-(\w+)/(.+)}
"#$1/#$2/#{File.basename($3, '.rb')}"
when %r{^#{HOMEBREW_LIBRARY}/Formula/(.+)}
"mxcl/master/#{File.basename($1, '.rb')}"
else
self.basenname('.rb').to_s
nil
end
end
end

10
Library/Homebrew/cmd/untap.rb
View File

@ -8,15 +8,21 @@ module Homebrew extend self
raise "No such tap!" unless tapd.directory?
gitignores = (HOMEBREW_LIBRARY/"Formula/.gitignore").read.split rescue []
untapped = 0
tapd.find_formula do |pn|
bn = pn.basename.to_s
pn = HOMEBREW_LIBRARY/"Formula/#{bn}"
pn.delete if pn.symlink? and pn.realpath.to_s =~ %r[^#{tapd.realpath}]
gitignores.delete(bn)
if pn.symlink? and pn.realpath.to_s =~ %r[^#{tapd.realpath}]
pn.delete
gitignores.delete(bn)
untapped += 1
end
end
rm_rf tapd
HOMEBREW_REPOSITORY.join("Library/Formula/.gitignore").atomic_write(gitignores * "\n")
puts "Untapped #{untapped} formula"
end
end