aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Vandenberg2010-08-21 11:45:08 -0700
committerAdam Vandenberg2010-08-21 11:45:08 -0700
commitc9d41345d0413f98c2a560f9ead4d79025c9783c (patch)
tree23082b93702e2d05d6f6f7a82d76198d7616d552
parent4e6d7a4de9d57b12c1eb6a6649e78f33c5c7fb4a (diff)
downloadbrew-c9d41345d0413f98c2a560f9ead4d79025c9783c.tar.bz2
Deal with symlinked meta files
-rwxr-xr-xLibrary/Homebrew/install.rb11
1 files changed, 7 insertions, 4 deletions
diff --git a/Library/Homebrew/install.rb b/Library/Homebrew/install.rb
index 722accb52..72a2f1682 100755
--- a/Library/Homebrew/install.rb
+++ b/Library/Homebrew/install.rb
@@ -94,10 +94,13 @@ def install f
f.prefix.mkpath
beginning=Time.now
f.install
- FORMULA_META_FILES.each do |file|
- next if File.directory? file
- FileUtils.mv "#{file}.txt", file rescue nil
- f.prefix.install file rescue nil
+ FORMULA_META_FILES.each do |filename|
+ next if File.directory? filename
+ target_file = filename
+ target_file = "#{filename}.txt" if File.exists? "#{filename}.txt"
+ # Some software symlinks these files (see help2man.rb)
+ target_file = Pathname.new(target_file).resolved_path
+ f.prefix.install target_file => filename rescue nil
(f.prefix+file).chmod 0644 rescue nil
end
build_time = Time.now-beginning