gcc_release (error, inform): Use $@ instead of $1.

* gcc_release (error, inform): Use $@ instead of $1.
	(build_sources): Check for ^[[:blank:]]*GCC in both index.html
	and changes.html, rather than for GCC in one and ^GCC in another one.

From-SVN: r265526
This commit is contained in:
Jakub Jelinek 2018-10-26 12:26:17 +02:00 committed by Jakub Jelinek
parent abb967da1c
commit 9038a1de78
2 changed files with 12 additions and 6 deletions

View File

@ -1,3 +1,9 @@
2018-10-26 Jakub Jelinek <jakub@redhat.com>
* gcc_release (error, inform): Use $@ instead of $1.
(build_sources): Check for ^[[:blank:]]*GCC in both index.html
and changes.html, rather than for GCC in one and ^GCC in another one.
2018-05-03 Jakub Jelinek <jakub@redhat.com>
PR other/85622

View File

@ -45,18 +45,18 @@
# Functions
########################################################################
# Issue the error message given by $1 and exit with a non-zero
# Issue the error message given by $@ and exit with a non-zero
# exit code.
error() {
echo "gcc_release: error: $1"
echo "gcc_release: error: $@"
exit 1
}
# Issue the informational message given by $1.
# Issue the informational message given by $@.
inform() {
echo "gcc_release: $1"
echo "gcc_release: $@"
}
# Issue a usage message explaining how to use this script.
@ -128,12 +128,12 @@ build_sources() {
previndex="http:\/\/gcc.gnu.org\/gcc-`expr ${RELEASE_MAJOR} - 1`\/index.html"
sed -n -e "/^${thisindex}/,/^${thischanges}/p" NEWS |\
sed -n -e "/Release History/,/References and Acknowledgments/p" |\
grep -q "GCC ${RELEASE_MAJOR}.${RELEASE_MINOR}" ||\
grep -q "^[[:blank:]]*GCC ${RELEASE_MAJOR}.${RELEASE_MINOR}" ||\
error "GCC ${RELEASE_MAJOR}.${RELEASE_MINOR} not mentioned "\
"in gcc-${RELEASE_MAJOR}/index.html"
sed -n -e "/^${thischanges}/,/^${previndex}/p" NEWS |\
grep -q "^GCC ${RELEASE_MAJOR}.${RELEASE_MINOR}" ||\
grep -q "^[[:blank:]]*GCC ${RELEASE_MAJOR}.${RELEASE_MINOR}" ||\
error "GCC ${RELEASE_MAJOR}.${RELEASE_MINOR} not mentioned "\
"in gcc-${RELEASE_MAJOR}/changes.html"