diff options
| author | Jack Nagel | 2013-08-09 21:09:48 -0500 |
|---|---|---|
| committer | Jack Nagel | 2013-08-10 19:02:00 -0500 |
| commit | 99976efeed53b17d7cf331fbdfe7710bf8a80cd2 (patch) | |
| tree | 7897d13241d645cb881136a79dba0230eb507b83 /Library/Homebrew/keg.rb | |
| parent | 8508bdf98582805194c4e52a8d5531d5e77975d0 (diff) | |
| download | homebrew-99976efeed53b17d7cf331fbdfe7710bf8a80cd2.tar.bz2 | |
Make usage of ObserverPathnameExtension more obvious
Remove use of globals.
Closes #21795.
Diffstat (limited to 'Library/Homebrew/keg.rb')
| -rw-r--r-- | Library/Homebrew/keg.rb | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb index 6218668d6..4791255d1 100644 --- a/Library/Homebrew/keg.rb +++ b/Library/Homebrew/keg.rb @@ -33,9 +33,7 @@ class Keg < Pathname end def unlink - # these are used by the ObserverPathnameExtension to count the number - # of files and directories linked - $n=$d=0 + ObserverPathnameExtension.reset_counts! dirs = [] @@ -62,7 +60,7 @@ class Keg < Pathname dirs.reverse_each(&:rmdir_if_possible) - $n+$d + ObserverPathnameExtension.total end def fname @@ -108,8 +106,7 @@ class Keg < Pathname def link mode=OpenStruct.new raise "Cannot link #{fname}\nAnother version is already linked: #{linked_keg_record.realpath}" if linked_keg_record.directory? - $n=0 - $d=0 + ObserverPathnameExtension.reset_counts! share_mkpaths = %w[aclocal doc info locale man] share_mkpaths.concat((1..8).map { |i| "man/man#{i}" }) @@ -175,7 +172,7 @@ class Keg < Pathname optlink end - return $n + $d + ObserverPathnameExtension.total rescue Exception opoo "Could not link #{fname}. Unlinking..." unlink |