@@ -99,11 +99,15 @@ end def get_size s scales = {'k' => 1024, 'M' => 1024*1024} - scale = s[-1..-1] - if not scales[scale] then - return Integer(s) + begin + Integer(s) + rescue ArgumentError + scale = s[-1..-1] + if not scales[scale] + raise "Can't parse value to integer: #{s}" + end + Integer(s[0..-2]) * scales[scale] end - return Integer(s[0..-2]) * scales[scale] end def curl url, *args @@ -132,10 +136,12 @@ def curl url, *args end line = line.split - # setup progress bar if total size already known - if not bar then - total = get_size(line[1]) - next if not total > 0 + # setup progress bar if: + total = get_size(line[1]) + next if not total > 0 # - total size already known + # - there is no bar + # - or bar total is less the current total (redirect happened) + if not bar or total > bar.total then title = url.split('/')[-1] bar = ProgressBar.new(title, total) bar.file_transfer_mode Library/Homebrew/utils.rb 8e113a6641a7912b109f70caf08f294009f4fc1c Alexander Solovyov piranha@piranha.org.ua http://github.com/piranha/homebrew/commit/bc478119352f650642b484bc591090c90825f337 bc478119352f650642b484bc591090c90825f337 2009-11-12T04:25:01-08:00 2009-11-05T03:02:01-08:00 progress bar: fix dealing with redirects ee30d2d41981596500d5bfa5292d366bf197e1bc Alexander Solovyov piranha@piranha.org.ua