aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2014-04-09 09:35:19 +0200
committerLukas Larsson <[email protected]>2014-06-03 11:43:49 +0200
commit74d314b0085d5b83b1c7e9aefee8e770b66f93cb (patch)
treec5f457d80a35882e824a57c1dff713206606db8f /erts
parent07b8f441ca711f9812fad9e9115bab3c3aa92f79 (diff)
downloadotp-74d314b0085d5b83b1c7e9aefee8e770b66f93cb.tar.gz
otp-74d314b0085d5b83b1c7e9aefee8e770b66f93cb.tar.bz2
otp-74d314b0085d5b83b1c7e9aefee8e770b66f93cb.zip
erts: Fix git version script
Diffstat (limited to 'erts')
-rwxr-xr-xerts/emulator/utils/gen_git_version6
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/utils/gen_git_version b/erts/emulator/utils/gen_git_version
index ef06a4b8e2..9faf015b62 100755
--- a/erts/emulator/utils/gen_git_version
+++ b/erts/emulator/utils/gen_git_version
@@ -5,9 +5,9 @@ OUTPUT_FILE=$1
if command -v git 2>&1 >/dev/null &&
test -d $ERL_TOP/.git -o -f $ERL_TOP/.git
then
- VSN=`git describe --match "OTP_R[0-9][0-9][A-B]*" HEAD`
+ VSN=`git describe --match "OTP-[0-9]*" HEAD`
case "$VSN" in
- OTP_R*-g*)
+ OTP-*-g*)
VSN=`echo $VSN | sed -e 's/.*-g\\(.*\\)/\\1/g'` ;;
*) VSN="na" ;;
esac
@@ -36,4 +36,4 @@ then
fi
exit 0
fi
-exit 1 \ No newline at end of file
+exit 1