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

diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index 0259aabd1d3838f9ed87fec3df36e6ca2f297e95..db6cffe56ae551920318139d283c561e919a24ad 100644 (file)
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -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

diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release
index 440b0ba51ff91ba078d6ac7a132f7767573e614a..bfb6b037bb16aa183820d4813ba6e0db4ad798ef 100755 (executable)
--- a/maintainer-scripts/gcc_release
+++ b/maintainer-scripts/gcc_release
@@ -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"