Fixes #10013: ncf script doesn't call properly list-compatible-inputs properly #85
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
ncharles
force-pushed
the
bug_10013/ncf_script_doesn_t_call_properly_list_compatible_inputs_properly
branch
from
b5b33e3
to
524f58c
Compare
|
Commit modified |
ncharles
commented
Jan 17, 2017
| @@ -105,6 +199,21 @@ EOF | |||
|
|
|||
| # MAIN | |||
| # Simple but enough at the moment | |||
| # Check if a server_version is defined | |||
| if [ "$1" = "-V" ] | |||
There was a problem hiding this comment.
i'm really not convinced by -V to define the version, but I didn't have any better idea
peckpeck
requested changes
Jan 17, 2017
| define_ncf_init() { | ||
| # If we have a Rudder 3.1, we need to use standard ncf init | ||
| is_version_valid "$RUDDER_VERSION" "3.1" | ||
| if [ $? -eq 0 ] |
There was a problem hiding this comment.
You can just write
if is_version_valid "$RUDDER_VERSION" "3.1"
There was a problem hiding this comment.
if is_version_valid "$RUDDER_VERSION" "3.1"
then
...
| NCF_VERSION="0.x" | ||
| fi | ||
| # If we have a Rudder 3.2 or 4.0, we need to use ncf of version 1 | ||
| is_version_valid "$RUDDER_VERSION" "[3.2 4.0]" |
There was a problem hiding this comment.
We usually use the form "${VARIABLE}" for variable expansion
| @@ -105,6 +199,21 @@ EOF | |||
|
|
|||
| # MAIN | |||
| # Simple but enough at the moment | |||
| # Check if a server_version is defined | |||
| if [ "$1" = "-V" ] | |||
ncharles
force-pushed
the
bug_10013/ncf_script_doesn_t_call_properly_list_compatible_inputs_properly
branch
from
524f58c
to
b500810
Compare
|
Commit modified |
peckpeck
approved these changes
Feb 8, 2017
|
OK, merging this PR |
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.
https://www.rudder-project.org/redmine/issues/10013