From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 30 Jun 2014 06:50:54 +0000 (+0000)
Subject: scripts: unset GREP_OPTIONS in env and feeds (fixes #16924)
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=1abb1b91c3c506575901118a0c365fae605846a8;p=12.09%2Fopenwrt.git

scripts: unset GREP_OPTIONS in env and feeds (fixes #16924)

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

Backport of r41407

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@41408 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/scripts/env b/scripts/env
index 24d4bec..5542b20 100755
--- a/scripts/env
+++ b/scripts/env
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 BASEDIR="$PWD"
 ENVDIR="$PWD/env"
+export GREP_OPTIONS=
 
 usage() {
 	cat <<EOF
diff --git a/scripts/feeds b/scripts/feeds
index b1bdee5..683c505 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -11,6 +11,7 @@ use Cwd 'abs_path';
 chdir "$FindBin::Bin/..";
 $ENV{TOPDIR}=getcwd();
 $ENV{GIT_CONFIG_PARAMETERS}="'core.autocrlf=false'";
+$ENV{GREP_OPTIONS}="";
 
 my $mk=`which gmake 2>/dev/null`;	# select the right 'make' program
 chomp($mk);		# trim trailing newline