From: Daiki Ueno <ueno@gnu.org>
Date: Wed, 23 Apr 2014 02:57:14 +0000 (+0900)
Subject: autopoint: Unset variables known to interfere with common tools
X-Git-Tag: v0.19~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d70724a34ca4d4f26e588ec5c300820bc1f2822d;p=thirdparty%2Fgettext.git

autopoint: Unset variables known to interfere with common tools

Reported by Jan Cholasta at:
<https://bugzilla.redhat.com/show_bug.cgi?id=801374>.
* autopoint.in: Unset CDPATH, CLICOLOR_FORCE, and GREP_OPTIONS.
* gettextize.in: Unset CLICOLOR_FORCE and GREP_OPTIONS.
---

diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index 978955b0c..f51ec123f 100644
--- a/gettext-tools/misc/ChangeLog
+++ b/gettext-tools/misc/ChangeLog
@@ -1,3 +1,11 @@
+2014-04-23  Daiki Ueno  <ueno@gnu.org>
+
+	autopoint: Unset variables known to interfere with common tools
+	Reported by Jan Cholasta at:
+	<https://bugzilla.redhat.com/show_bug.cgi?id=801374>.
+	* autopoint.in: Unset CDPATH, CLICOLOR_FORCE, and GREP_OPTIONS.
+	* gettextize.in: Unset CLICOLOR_FORCE and GREP_OPTIONS.
+
 2014-04-21  Daiki Ueno  <ueno@gnu.org>
 
 	* autopoint.in: Rename gettext_dir to gettext_datadir.
diff --git a/gettext-tools/misc/autopoint.in b/gettext-tools/misc/autopoint.in
index b388c4b5a..5c018e643 100644
--- a/gettext-tools/misc/autopoint.in
+++ b/gettext-tools/misc/autopoint.in
@@ -219,6 +219,13 @@ func_fatal_error ()
   exit 1
 }
 
+# Nuisances.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
 # Command-line option processing.
 # Removes the OPTIONS from the arguments. Sets the variables:
 # - force           yes if --force was given, empty otherwise
diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in
index f48194486..4bd312611 100644
--- a/gettext-tools/misc/gettextize.in
+++ b/gettext-tools/misc/gettextize.in
@@ -222,6 +222,10 @@ func_fatal_error ()
 # Nuisances.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
 # Command-line option processing.
 # Removes the OPTIONS from the arguments. Sets the variables:
 # - force           1 if --force was given, 0 otherwise