]> git.ipfire.org Git - thirdparty/gettext.git/commitdiff
autopoint: Unset variables known to interfere with common tools
authorDaiki Ueno <ueno@gnu.org>
Wed, 23 Apr 2014 02:57:14 +0000 (11:57 +0900)
committerDaiki Ueno <ueno@gnu.org>
Wed, 23 Apr 2014 02:57:14 +0000 (11:57 +0900)
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.

gettext-tools/misc/ChangeLog
gettext-tools/misc/autopoint.in
gettext-tools/misc/gettextize.in

index 978955b0cb1da14d99d841b400dff82ca7799137..f51ec123f454e64b20d9852c393bc5a4aea7f081 100644 (file)
@@ -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.
index b388c4b5aabc4d1185086b8bb5c0490a90bc9ede..5c018e64351cc5302beeb01822f045e8a99d7300 100644 (file)
@@ -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
index f4819448664f351c3c52a17d0cf43f2078562197..4bd3126118a7609729092586a8d8a21698afafc8 100644 (file)
@@ -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