Skip to content

Change the regular expression match syntax used for version checking #1327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danpovey merged 1 commit into from
Jan 9, 2017
Merged

Change the regular expression match syntax used for version checking #1327

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/base/get_version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,10 @@ cd "$(dirname ${BASH_SOURCE[0]})"
# Read the partial version number specified in the first line of src/.version.
version=$(head -1 ../.version)

# Empty version number is not allowed.
if [ -z "$version" ]; then
version="?"
fi

if [ -e ../.short_version ]; then
echo "$0: File src/.short_version exists."
echo "$0: Stopping the construction of full version number from git history."
elif [[ $version != +([0-9]).+([0-9]) ]]; then
elif ! [[ $version =~ ^[0-9][0-9]*.[0-9][0-9]*$ ]]; then
echo "$0: The version number \"$version\" specified in src/.version is not" \
"in MAJOR.MINOR format."
echo "$0: Stopping the construction of full version number from git history."
Expand Down Expand Up @@ -76,6 +71,11 @@ else
version="$version-${head_commit_short}"
fi

# Empty version number is not allowed.
if [ -z "$version" ]; then
version="?"
fi

# Write version info to a temporary file.
temp=$(mktemp)
trap 'rm -f "$temp"' EXIT
Expand Down