Commit 9038a1de by Jakub Jelinek Committed by Jakub Jelinek

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
parent abb967da
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> 2018-05-03 Jakub Jelinek <jakub@redhat.com>
PR other/85622 PR other/85622
......
...@@ -45,18 +45,18 @@ ...@@ -45,18 +45,18 @@
# Functions # 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. # exit code.
error() { error() {
echo "gcc_release: error: $1" echo "gcc_release: error: $@"
exit 1 exit 1
} }
# Issue the informational message given by $1. # Issue the informational message given by $@.
inform() { inform() {
echo "gcc_release: $1" echo "gcc_release: $@"
} }
# Issue a usage message explaining how to use this script. # Issue a usage message explaining how to use this script.
...@@ -128,12 +128,12 @@ build_sources() { ...@@ -128,12 +128,12 @@ build_sources() {
previndex="http:\/\/gcc.gnu.org\/gcc-`expr ${RELEASE_MAJOR} - 1`\/index.html" previndex="http:\/\/gcc.gnu.org\/gcc-`expr ${RELEASE_MAJOR} - 1`\/index.html"
sed -n -e "/^${thisindex}/,/^${thischanges}/p" NEWS |\ sed -n -e "/^${thisindex}/,/^${thischanges}/p" NEWS |\
sed -n -e "/Release History/,/References and Acknowledgments/p" |\ 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 "\ error "GCC ${RELEASE_MAJOR}.${RELEASE_MINOR} not mentioned "\
"in gcc-${RELEASE_MAJOR}/index.html" "in gcc-${RELEASE_MAJOR}/index.html"
sed -n -e "/^${thischanges}/,/^${previndex}/p" NEWS |\ 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 "\ error "GCC ${RELEASE_MAJOR}.${RELEASE_MINOR} not mentioned "\
"in gcc-${RELEASE_MAJOR}/changes.html" "in gcc-${RELEASE_MAJOR}/changes.html"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment