public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-7536] contrib: Fix gcc-descr script [PR102664]
@ 2022-03-08 16:48 Jonathan Wakely
0 siblings, 0 replies; only message in thread
From: Jonathan Wakely @ 2022-03-08 16:48 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:10ecf5182a0f63d79a44b953483ecfbb54d29bcb
commit r12-7536-g10ecf5182a0f63d79a44b953483ecfbb54d29bcb
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Tue Mar 8 16:44:17 2022 +0000
contrib: Fix gcc-descr script [PR102664]
POSIX expr does not support the 'match' keyword, so the git-descr.sh
scripts should use ':' instead.
contrib/ChangeLog:
PR other/102664
* git-descr.sh: Use portable form of expr match.
Diff:
---
contrib/git-descr.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/git-descr.sh b/contrib/git-descr.sh
index eb258148a66..ba5d711f330 100755
--- a/contrib/git-descr.sh
+++ b/contrib/git-descr.sh
@@ -23,7 +23,7 @@ elif test x$long = xyes; then
r=$(git describe --all --abbrev=40 --match 'basepoints/gcc-[0-9]*' $c | sed -n 's,^\(tags/\)\?basepoints/gcc-,r,p')
else
r=$(git describe --all --abbrev=14 --match 'basepoints/gcc-[0-9]*' $c | sed -n 's,^\(tags/\)\?basepoints/gcc-,r,p');
- expr match ${r:-no} 'r[0-9]\+$' >/dev/null && r=${r}-0-g$(git rev-parse $c);
+ expr ${r:-no} : 'r[0-9]\+$' >/dev/null && r=${r}-0-g$(git rev-parse $c);
fi;
if test -n $r; then
o=$(git config --get gcc-config.upstream);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-03-08 16:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-08 16:48 [gcc r12-7536] contrib: Fix gcc-descr script [PR102664] Jonathan Wakely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).