-
-
Notifications
You must be signed in to change notification settings - Fork 3k
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.
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
Fixes #3133: Properly handle release candidates in version comparison #3136
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
#!/bin/sh | ||
|
||
if test "x$UPGRADE_MSG" = "x"; then | ||
printf >&2 "fatal: Please set '"'$UPGRADE_MSG'"' before sourcing this script\n" | ||
exit 1 | ||
fi | ||
|
||
die_upgrade() { | ||
printf >&2 "fatal: %s\n" "$@" | ||
printf >&2 "=> %s\n" "$UPGRADE_MSG" | ||
exit 1 | ||
} | ||
|
||
major_number() { | ||
vers="$1" | ||
|
||
# Hack around 'expr' exiting with code 1 when it outputs 0 | ||
case "$vers" in | ||
0) echo "0" ;; | ||
0.*) echo "0" ;; | ||
*) expr "$vers" : "\([^.]*\).*" || return 1 | ||
esac | ||
} | ||
|
||
check_at_least_version() { | ||
MIN_VERS="$1" | ||
CUR_VERS="$2" | ||
PROG_NAME="$3" | ||
|
||
# Get major, minor and fix numbers for each version | ||
MIN_MAJ=$(major_number "$MIN_VERS") || die "No major version number in '$MIN_VERS' for '$PROG_NAME'" | ||
CUR_MAJ=$(major_number "$CUR_VERS") || die "No major version number in '$CUR_VERS' for '$PROG_NAME'" | ||
|
||
# We expect a version to be of form X.X.X | ||
# if the second dot doesn't match, we consider it a prerelease | ||
|
||
if MIN_MIN=$(expr "$MIN_VERS" : "[^.]*\.\([0-9]\+\)"); then | ||
# this captured digit is neccessary, since expr returns code 1 if the output is empty | ||
if expr "$MIN_VERS" : "[^.]*\.[0-9]*\([0-9]\.\|[0-9]\$\)" >/dev/null; then | ||
MIN_PRERELEASE="0" | ||
else | ||
MIN_PRERELEASE="1" | ||
fi | ||
MIN_FIX=$(expr "$MIN_VERS" : "[^.]*\.[0-9]\+[^0-9]\+\([0-9]\+\)") || MIN_FIX="0" | ||
else | ||
MIN_MIN="0" | ||
MIN_PRERELEASE="0" | ||
MIN_FIX="0" | ||
fi | ||
if CUR_MIN=$(expr "$CUR_VERS" : "[^.]*\.\([0-9]\+\)"); then | ||
# this captured digit is neccessary, since expr returns code 1 if the output is empty | ||
if expr "$CUR_VERS" : "[^.]*\.[0-9]*\([0-9]\.\|[0-9]\$\)" >/dev/null; then | ||
CUR_PRERELEASE="0" | ||
else | ||
CUR_PRERELEASE="1" | ||
fi | ||
CUR_FIX=$(expr "$CUR_VERS" : "[^.]*\.[0-9]\+[^0-9]\+\([0-9]\+\)") || CUR_FIX="0" | ||
else | ||
CUR_MIN="0" | ||
CUR_PRERELEASE="0" | ||
CUR_FIX="0" | ||
fi | ||
|
||
# Compare versions | ||
VERS_LEAST="$PROG_NAME version '$CUR_VERS' should be at least '$MIN_VERS'" | ||
test "$CUR_MAJ" -lt "$MIN_MAJ" && die_upgrade "$VERS_LEAST" | ||
test "$CUR_MAJ" -gt "$MIN_MAJ" || { | ||
test "$CUR_MIN" -lt "$MIN_MIN" && die_upgrade "$VERS_LEAST" | ||
test "$CUR_MIN" -gt "$MIN_MIN" || { | ||
test "$CUR_PRERELEASE" -gt "$MIN_PRERELEASE" && die_upgrade "$VERS_LEAST" | ||
test "$CUR_PRERELEASE" -lt "$MIN_PRERELEASE" || { | ||
test "$CUR_FIX" -lt "$MIN_FIX" && die_upgrade "$VERS_LEAST" | ||
true | ||
} | ||
} | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
wat. Thats dumb. (I just ran this in my shell)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree, but that's from the original version checking code by chriscool.
The same goes for an empty string as output, hence the digit captured in both regex alternations at lines 39/52.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@whyrusleeping and @mateon1 I am not sure what you think is dump.
My opinion is that
expr
exiting with code 1 when it returns 0 is really dump indeed!It looks like it comes from the fact that it can be used for arithmetics.