From 69c7a20896813aefa519aaee7b75552731cd672a Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Wed, 19 Apr 2017 10:49:20 +0100 Subject: Fix `brew edit` with environment filtering. For many people `brew edit` makes use of the `EDITOR` variable to pick a sensible editor. With environment filtering enabled unless this editor is found in the default system PATH it'll fall back to e.g. `vim`. Instead, ensure that we export the original, pre-filtering `PATH` as `HOMEBREW_PATH` and use that internally to locate the editor. In future this same approach will likely be used for requirements to be able to find tools, too, and for other variables which we want to expose to Homebrew itself but not other build tools. Note that `HOMEBREW_PATH` is the same as `PATH` when build filtering hasn't been enabled. --- bin/brew | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'bin') diff --git a/bin/brew b/bin/brew index 43a807c7b..84be2fb1d 100755 --- a/bin/brew +++ b/bin/brew @@ -44,6 +44,14 @@ fi HOMEBREW_LIBRARY="$HOMEBREW_REPOSITORY/Library" +for VAR in EDITOR PATH +do + VAR_NEW="HOMEBREW_${VAR}" + # TODO: find a better solution than this. + env | grep -q "$VAR_NEW" && continue + export "$VAR_NEW"="${!VAR}" +done + if [[ -n "$HOMEBREW_ENV_FILTERING" ]] then PATH="/usr/bin:/bin:/usr/sbin:/sbin" -- cgit v1.2.3