From 74c77db5bd51c330fc1da267b58d0774d3616bab Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 26 Jul 2018 10:48:25 +0100 Subject: [PATCH] shell: tweak export_value parameters. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let’s have a default value for shell (considering this isn’t a public API) to make it easier to use. --- Library/Homebrew/cmd/--env.rb | 4 +++- Library/Homebrew/utils/shell.rb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/cmd/--env.rb b/Library/Homebrew/cmd/--env.rb index e0a2b9f191..3d45a8fec7 100644 --- a/Library/Homebrew/cmd/--env.rb +++ b/Library/Homebrew/cmd/--env.rb @@ -37,7 +37,9 @@ module Homebrew if shell.nil? dump_build_env ENV else - env_keys.each { |key| puts Utils::Shell.export_value(shell, key, ENV[key]) } + env_keys.each do |key| + puts Utils::Shell.export_value(key, ENV[key], shell) + end end end end diff --git a/Library/Homebrew/utils/shell.rb b/Library/Homebrew/utils/shell.rb index 7799dc1db1..fb602a2726 100644 --- a/Library/Homebrew/utils/shell.rb +++ b/Library/Homebrew/utils/shell.rb @@ -21,7 +21,7 @@ module Utils end # quote values. quoting keys is overkill - def export_value(shell, key, value) + def export_value(key, value, shell = preferred) case shell when :bash, :ksh, :sh, :zsh "export #{key}=\"#{sh_quote(value)}\""