Skip to content

Commit 677aa0d

Browse files
committed
Fix version verification when "\|" doesn't work in sed.
1 parent 0255967 commit 677aa0d

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

mkgitver

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ if [ ! -f git-version.h ]; then
77
fi
88

99
if test -d "$srcdir/.git" || test -f "$srcdir/.git"; then
10-
gitver=`git describe --abbrev=8 2>/dev/null | sed -n '/^v3\.[0-9][0-9]*\.[0-9][0-9]*\(pre[0-9]*\)*\(-\|$\)/p'`
11-
if [ -n "$gitver" ]; then
10+
gitver=`git describe --abbrev=8 2>/dev/null`
11+
# NOTE: I'm avoiding "|" in sed since I'm not sure if sed -r is portable and "\|" fails on some OSes.
12+
verchk=`echo "$gitver-" | sed -n '/^v3\.[0-9][0-9]*\.[0-9][0-9]*\(pre[0-9]*\)*-/p'`
13+
if [ -n "$verchk" ]; then
1214
echo "#define RSYNC_GITVER \"$gitver\"" >git-version.h.new
1315
if ! diff git-version.h.new git-version.h >/dev/null; then
1416
echo "Updating git-version.h"

0 commit comments

Comments
 (0)