>From 82194a03cab101aeb5114bdca3100ab97772d6b0 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Wed, 10 Oct 2018 13:20:45 +0200 Subject: [PATCH 1/2] shellcheck: redirect both stdout and stderr Per ShellCheck warning. * gettext-tools/misc/autopoint.in (func_version_prereq): Reorder FD redirection so both stderr/stdout is dropped. * gettext-tools/misc/gettextize.in: Likewise. --- gettext-tools/misc/autopoint.in | 2 +- gettext-tools/misc/gettextize.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gettext-tools/misc/autopoint.in b/gettext-tools/misc/autopoint.in index d503235cd..16feab739 100644 --- a/gettext-tools/misc/autopoint.in +++ b/gettext-tools/misc/autopoint.in @@ -321,7 +321,7 @@ func_version_prereq () req="$1" ver="$2" echo "m4_if(m4_version_compare([$ver], [$req]), [-1], [m4_exit([1])])" \ - | "$AUTOM4TE" --language=M4sugar 2>&1 >/dev/null + | "$AUTOM4TE" --language=M4sugar >/dev/null 2>&1 } # If AM_GNU_GETTEXT_REQUIRE_VERSION is used and archive_version is newer than diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in index e3e7eceb9..459df6361 100644 --- a/gettext-tools/misc/gettextize.in +++ b/gettext-tools/misc/gettextize.in @@ -1256,7 +1256,7 @@ func_modify_configure_in "(AC_OUTPUT): Remove command that created po/Makefile." sed -e '/^\(dnl \|\)AC_LINK_FILES(\$nls_cv_header_libgt, \$nls_cv_header_intl)$/d' < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp" func_modify_configure_in "(AC_LINK_FILES): Remove invocation." # AM_GNU_GETTEXT_VERSION may not be present, when AM_GNU_GETTEXT_REQUIRE_VERSION is used. -if grep '^AM_GNU_GETTEXT_VERSION(' "$srcdir/$configure_in" 2>&1 >/dev/null; then +if grep '^AM_GNU_GETTEXT_VERSION(' "$srcdir/$configure_in" >/dev/null 2>&1; then sed -e 's/^AM_GNU_GETTEXT_VERSION([^()]*)/AM_GNU_GETTEXT_VERSION(['"$archive_version"'])/' < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp" func_modify_configure_in "(AM_GNU_GETTEXT_VERSION): Bump to $archive_version." fi -- 2.17.1