From ddf2c2a9d437a1d6d1079e837a71154bd844d304 Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Mon, 21 Aug 2017 17:25:15 -0400 Subject: [PATCH] Change backticks to preferred $(...) syntax. Replace A && B || C syntax with if-then-else. Apparently, this can fail, even if B is "echo ...", if STDOUT is for some reason closed. See https://github.com/koalaman/shellcheck/wiki/SC2015. --- autogen.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/autogen.sh b/autogen.sh index 2cacc5c413..c3e67a0624 100755 --- a/autogen.sh +++ b/autogen.sh @@ -6,14 +6,14 @@ AUTOMAKE="automake --add-missing --force-missing --copy --foreign" AUTOCONF="autoconf" # Discover what version of automake we are using. -automake_version=`$AUTOMAKE --version 2>/dev/null | head -n 1` +automake_version=$($AUTOMAKE --version 2>/dev/null | head -n 1) -test "$automake_version" != "" && { +if "$automake_version" != ""; then echo "Using $automake_version" -} || { +else echo "LyX requires automake >= 1.14" exit 1 -} +fi case $automake_version in *' '1.1[45]*) @@ -26,14 +26,14 @@ case $automake_version in esac # Discover what version of autoconf we are using. -autoversion=`$AUTOCONF --version 2>/dev/null | head -n 1` +autoversion=$($AUTOCONF --version 2>/dev/null | head -n 1) -test "$autoversion" != "" && { +if "$autoversion" != ""; then echo "Using $autoversion" -} || { +else echo "LyX requires autoconf >= 2.65" exit 1 -} +fi case $autoversion in *' '2.6[5-9])