build: fix 'make ui' scripts so that it can handle versions like "v1.4.0-rc1-55-g2c8675565-rc1 (2c8675565)" (#4920)

This commit is contained in:
R.B. Boyer 2019-01-29 14:24:26 -06:00 committed by GitHub
parent 7302285321
commit 8e0ebc0f62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions

View File

@ -974,7 +974,7 @@ function shasum_directory {
return 1 return 1
fi fi
local ui_version=$(sed -n ${SED_EXT} -e 's/.*CONSUL_VERSION%22%3A%22([^%]*)%22%2C%22.*/\1/p' < "$1") || return 1 local ui_version="$(grep '<!-- CONSUL_VERSION: .* -->$' "$1" | sed 's/^<!-- CONSUL_VERSION: \(.*\) -->$/\1/')" || return 1
echo "$ui_version" echo "$ui_version"
return 0 return 0
} }