diff options
| author | Markus Reiter | 2017-06-03 00:49:06 +0200 | 
|---|---|---|
| committer | GitHub | 2017-06-03 00:49:06 +0200 | 
| commit | 8d514ae8f09a03106ed764412c7314f3f4808394 (patch) | |
| tree | d826e3f7fc8d06629abe52715a17b42f9473254a /Library/Homebrew/cmd | |
| parent | d596c955842336d6a660fb7d598cb8a6b4d9a035 (diff) | |
| parent | 2d6ae61314558b383cfa641e2de0839d5606afca (diff) | |
| download | brew-8d514ae8f09a03106ed764412c7314f3f4808394.tar.bz2 | |
Merge pull request #2716 from reitermarkus/re-revert
Re-revert "Fix operator spacing."
Diffstat (limited to 'Library/Homebrew/cmd')
| -rw-r--r-- | Library/Homebrew/cmd/list.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/cmd/search.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/cmd/switch.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/cmd/unpack.rb | 2 | 
4 files changed, 5 insertions, 5 deletions
diff --git a/Library/Homebrew/cmd/list.rb b/Library/Homebrew/cmd/list.rb index 790d858aa..f5c4e68ac 100644 --- a/Library/Homebrew/cmd/list.rb +++ b/Library/Homebrew/cmd/list.rb @@ -129,7 +129,7 @@ module Homebrew        names.each do |d|          versions = d.subdirs.map { |pn| pn.basename.to_s }          next if ARGV.include?("--multiple") && versions.length < 2 -        puts "#{d.basename} #{versions*" "}" +        puts "#{d.basename} #{versions * " "}"        end      end    end diff --git a/Library/Homebrew/cmd/search.rb b/Library/Homebrew/cmd/search.rb index ca50e8127..2b35dfc36 100644 --- a/Library/Homebrew/cmd/search.rb +++ b/Library/Homebrew/cmd/search.rb @@ -114,7 +114,7 @@ module Homebrew    def search_formulae(regex)      aliases = Formula.alias_full_names -    results = (Formula.full_names+aliases).grep(regex).sort +    results = (Formula.full_names + aliases).grep(regex).sort      results.map do |name|        begin diff --git a/Library/Homebrew/cmd/switch.rb b/Library/Homebrew/cmd/switch.rb index 6eed1fd96..a40b4d88e 100644 --- a/Library/Homebrew/cmd/switch.rb +++ b/Library/Homebrew/cmd/switch.rb @@ -25,7 +25,7 @@ module Homebrew      end      # Does the target version exist? -    unless (rack+version).directory? +    unless (rack/version).directory?        onoe "#{name} does not have a version \"#{version}\" in the Cellar."        versions = rack.subdirs.map { |d| Keg.new(d).version } @@ -41,7 +41,7 @@ module Homebrew        keg.unlink      end -    keg = Keg.new(rack+version) +    keg = Keg.new(rack/version)      # Link new version, if not keg-only      if keg_only?(rack) diff --git a/Library/Homebrew/cmd/unpack.rb b/Library/Homebrew/cmd/unpack.rb index 89992e1f0..51c2b59f0 100644 --- a/Library/Homebrew/cmd/unpack.rb +++ b/Library/Homebrew/cmd/unpack.rb @@ -29,7 +29,7 @@ module Homebrew      raise "Cannot write to #{unpack_dir}" unless unpack_dir.writable_real?      formulae.each do |f| -      stage_dir = unpack_dir.join("#{f.name}-#{f.version}") +      stage_dir = unpack_dir/"#{f.name}-#{f.version}"        if stage_dir.exist?          raise "Destination #{stage_dir} already exists!" unless ARGV.force?  | 
