Improve version display #168
Merged
Conversation
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
…a deployed version or not Signed-off-by: DL6ER <dl6er@dl6er.de>
AzureMarker
reviewed
Dec 8, 2017
args.c
Outdated
| char version[] = GIT_BRANCH; | ||
| // Check if version is of format vX.YYY or vXX.YYY | ||
| // '.' can never be part of a commit hash | ||
| if(version[2] == '.' || version[3] == '.') |
There was a problem hiding this comment.
This might be more future-proof?
if(strstr(version, ".") != NULL)
request.c
Outdated
| @@ -1038,7 +1038,8 @@ void getVersion(int *sock) | |||
| { | |||
| char server_message[SOCKETBUFFERLEN]; | |||
|
|
|||
| if(strcmp(GIT_BRANCH, "master") == 0) | |||
| char version[] = GIT_BRANCH; | |||
| if(version[2] == '.' || version[3] == '.') | |||
Signed-off-by: DL6ER <dl6er@dl6er.de>
jacobsalmela
approved these changes
Dec 10, 2017
|
This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there: https://discourse.pi-hole.net/t/pi-hole-v3-2-1-released-with-lots-of-fixes/6096/1 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
By submitting this pull request, I confirm the following (please check boxes, eg [X]) Failure to fill the template will close your PR:
Please submit all pull requests against the
developmentbranch. Failure to do so will delay or deny your requestHow familiar are you with the codebase?:
10
Improve version display, fixes pi-hole/web#626
GIT_BRANCHwill either be a hash (like437af07) or a tag (likev2.12). Since.can never be part of a commit hash, we detect if the version is either of the formatvX.YYYorvXX.YYY.This template was created based on the work of
udemy-dl.