diff options
| author | Pavel Raiskup <praiskup@redhat.com> | 2016-02-17 16:27:25 +0100 |
|---|---|---|
| committer | Pavel Raiskup <praiskup@redhat.com> | 2016-02-18 00:14:07 +0100 |
| commit | 40bc0628d5c8c9790164e76c9ab07ab170e2eafd (patch) | |
| tree | bacae193a7ef3e546787100a0377d1429d3b1e14 /build-aux | |
| parent | b89a47eae6d81a039f2ab36a8c510586f39afbd9 (diff) | |
| download | libtool-40bc0628d5c8c9790164e76c9ab07ab170e2eafd.tar.gz | |
edit-readme-alpha: generate the "stable" README properly
Fixes bug#20196. Reported by Peter Johansson and KO Myung-Hun
* build-aux/edit-readme-alpha: Invert the order of checks
and exit sooner if the file was already edited. Also fix the
typo 's/sed -n/sed/' (to print the rest of the file).
* Makefile.am ($(readme)): Double-quote the `cmd` to let test -n
work correctly.
Diffstat (limited to 'build-aux')
| -rwxr-xr-x | build-aux/edit-readme-alpha | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/build-aux/edit-readme-alpha b/build-aux/edit-readme-alpha index 3291fd04..6bf70827 100755 --- a/build-aux/edit-readme-alpha +++ b/build-aux/edit-readme-alpha @@ -62,16 +62,18 @@ for file in "$@"; do continue } + # Did we already in-place edited this file? + matched=`sed -n -e '/^This is an alpha testing release/,/a consistent, portable interface\.$/p' $file \ + |wc -l |sed 's|^ *||'` + test 3 = "$matched" && { + echo "$progname: $file already edited" >&2 + continue + } + # Make sure the paragraph we are matching has not been edited since # this script was written. matched=`sed -n -e '/^\[GNU Libtool\]\[libtool\] is/,/^consistent, portable interface\.$/p' $file \ |wc -l |sed 's|^ *||'` - - # Unless, of course, it was edited by this script already. - test 3 = "$matched" \ - || matched=`sed -n -e '/^This is an alpha testing release/,/a consistent, portable interface\.$/p' $file \ - |wc -l |sed 's|^ *||'` - test 3 = "$matched" \ || func_fatal_error "$file format has changed, please fix '$0'" @@ -79,7 +81,7 @@ for file in "$@"; do trap 'x=$?; rm $file.T; exit $x' 1 2 13 15 # Edit the first paragraph to be suitable for an alpha release. - sed -n '/^\[GNU Libtool\]\[libtool\] is/,/^consistent, portable interface\.$/c\ + sed '/^\[GNU Libtool\]\[libtool\] is/,/^consistent, portable interface\.$/c\ This is an alpha testing release of [GNU Libtool][libtool], a generic\ library support script. [Libtool][] hides the complexity of using shared\ libraries behind a consistent, portable interface.' $file > $file.T |