From c14a17310555dfabb1ecd61bad2f7b5350f93047 Mon Sep 17 00:00:00 2001 From: Kerin Millar Date: Thu, 29 Jun 2017 16:54:28 +0100 Subject: [PATCH 2/2] conftools/get-version.sh: Fix unsafe expansions of $hdr Also, use $() instead of ``. See http://mywiki.wooledge.org/BashFAQ/082. --- expat/conftools/get-version.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/expat/conftools/get-version.sh b/expat/conftools/get-version.sh index 91e5c64..2592f10 100755 --- a/expat/conftools/get-version.sh +++ b/expat/conftools/get-version.sh @@ -28,8 +28,8 @@ if test ! -r "$hdr"; then exit 1 fi -MAJOR_VERSION="`sed -n -e '/MAJOR_VERSION/s/[^0-9]*//gp' $hdr`" -MINOR_VERSION="`sed -n -e '/MINOR_VERSION/s/[^0-9]*//gp' $hdr`" -MICRO_VERSION="`sed -n -e '/MICRO_VERSION/s/[^0-9]*//gp' $hdr`" +MAJOR_VERSION=$(sed -n -e '/MAJOR_VERSION/s/[^0-9]*//gp' "$hdr") +MINOR_VERSION=$(sed -n -e '/MINOR_VERSION/s/[^0-9]*//gp' "$hdr") +MICRO_VERSION=$(sed -n -e '/MICRO_VERSION/s/[^0-9]*//gp' "$hdr") printf '%s.%s.%s' "$MAJOR_VERSION" "$MINOR_VERSION" "$MICRO_VERSION" -- 2.7.4