From 186368070c9cdd94bce27758ebadb699bc440c2f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 3 Jun 2009 00:05:21 +0000 Subject: use echo|grep instead of risking nested quotes git-svn-id: svn://tug.org/texlive/trunk@13589 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/ChangeLog | 5 +++++ Build/source/texk/web2c/configure | 2 +- Build/source/texk/web2c/configure.ac | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 1429d5fce8b..2449a7e0861 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,8 @@ +2009-06-03 Karl Berry + + * configure.ac (with_tex_banner): use echo|grep for check + instead of test -z ..., since we don't want to risk nested "quotes". + 2009-06-01 Peter Breitenlohner * Update version number to 2009. diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 36bc3c4167e..e51d94938f1 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -17727,7 +17727,7 @@ fi case $with_tex_banner in ''|yes|no) with_tex_banner="Web2C $WEB2CVERSION" ;; - *) if test -z `echo "$with_tex_banner" | sed -n "/ $WEB2CVERSION/p"`; then + *) if echo "$with_tex_banner" | grep -v "$WEB2CVERSION" >/dev/null; then { { $as_echo "$as_me:$LINENO: error: Bad \`--with-tex-banner=$with_tex_banner' version string (must contain \` $WEB2CVERSION')" >&5 $as_echo "$as_me: error: Bad \`--with-tex-banner=$with_tex_banner' version string (must contain \` $WEB2CVERSION')" >&2;} { (exit 1); exit 1; }; } diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac index 1bb30f4d901..af1db20d367 100644 --- a/Build/source/texk/web2c/configure.ac +++ b/Build/source/texk/web2c/configure.ac @@ -45,7 +45,7 @@ m4_include([ac/web2c.ac]) AS_CASE([$with_tex_banner], [''|yes|no], [with_tex_banner="Web2C $WEB2CVERSION"], - [AS_IF([test -z `echo "$with_tex_banner" | sed -n "/ $WEB2CVERSION/p"`], + [AS_IF([echo "$with_tex_banner" | grep -v "$WEB2CVERSION" >/dev/null], [AC_MSG_ERROR([Bad `--with-tex-banner=$with_tex_banner' version string (must contain ` $WEB2CVERSION')])])]) AC_DEFINE_UNQUOTED([WEB2CVERSION], [" ($with_tex_banner)"]) -- cgit v1.2.3