From f6cbf7bab0a4d743ca4122c39d60ea669b5f7e14 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Mon, 15 Feb 2016 11:31:10 +0000 Subject: Move internal command aliases from Ruby to Bash. This means that internal command aliases can be used for Bash commands (such as the new, Bash-based `brew update`). Fixes Homebrew/homebrew#49182. Closes Homebrew/homebrew#49184. Signed-off-by: Mike McQuaid --- Library/Homebrew/global.rb | 1 + Library/brew.rb | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'Library') diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb index d173e7df2..00028acad 100644 --- a/Library/Homebrew/global.rb +++ b/Library/Homebrew/global.rb @@ -48,6 +48,7 @@ require "compat" unless ARGV.include?("--no-compat") || ENV["HOMEBREW_NO_COMPAT" ORIGINAL_PATHS = ENV["PATH"].split(File::PATH_SEPARATOR).map { |p| Pathname.new(p).expand_path rescue nil }.compact.freeze +# TODO: remove this as soon as it's removed from commands.rb. HOMEBREW_INTERNAL_COMMAND_ALIASES = { "ls" => "list", "homepage" => "home", diff --git a/Library/brew.rb b/Library/brew.rb index 5a7ff0ac1..8675ab881 100644 --- a/Library/brew.rb +++ b/Library/brew.rb @@ -44,8 +44,6 @@ begin end end - cmd = HOMEBREW_INTERNAL_COMMAND_ALIASES.fetch(cmd, cmd) - # Add contributed commands to PATH before checking. Dir["#{HOMEBREW_LIBRARY}/Taps/*/*/cmd"].each do |tap_cmd_dir| ENV["PATH"] += "#{File::PATH_SEPARATOR}#{tap_cmd_dir}" -- cgit v1.2.3