summaryrefslogtreecommitdiffstats
path: root/gettext-tools/misc
diff options
context:
space:
mode:
authorDaiki Ueno <ueno@gnu.org>2014-04-23 11:57:14 +0900
committerDaiki Ueno <ueno@gnu.org>2014-04-23 11:57:14 +0900
commitd70724a34ca4d4f26e588ec5c300820bc1f2822d (patch)
treecd22183962ad109ec81b1516075bef1d830bba65 /gettext-tools/misc
parentaba9b27d89c360d358f33715928f205988e0b718 (diff)
downloadexternal_gettext-d70724a34ca4d4f26e588ec5c300820bc1f2822d.zip
external_gettext-d70724a34ca4d4f26e588ec5c300820bc1f2822d.tar.gz
external_gettext-d70724a34ca4d4f26e588ec5c300820bc1f2822d.tar.bz2
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.
Diffstat (limited to 'gettext-tools/misc')
-rw-r--r--gettext-tools/misc/ChangeLog8
-rw-r--r--gettext-tools/misc/autopoint.in7
-rw-r--r--gettext-tools/misc/gettextize.in4
3 files changed, 19 insertions, 0 deletions
diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index 978955b..f51ec12 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 b388c4b..5c018e6 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 f481944..4bd3126 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