Extract bundle fluentd plugins function #946
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
pmalek-sumo
requested review from
sumo-drosiek,
perk-sumo and
andrzej-stencel
andrzej-stencel
approved these changes
Sep 24, 2020
pmalek-sumo
deleted the
extract_bundle_fluentd_plugins_bash_function
branch
perk-sumo
reviewed
Sep 24, 2020
| @@ -18,6 +18,39 @@ function get_branch_to_checkout() { | |||
| || echo "${TRAVIS_BRANCH}" | |||
| } | |||
|
|
|||
| function bundle_fluentd_plugins() { | |||
| local VERSION="${1}" | |||
There was a problem hiding this comment.
Let's change the VERSION variable into version to indicate it's a local one.
Suggested change
| local VERSION="${1}" | |
| local version="${1}" |
| function bundle_fluentd_plugins() { | ||
| local VERSION="${1}" | ||
|
|
||
| if [[ "${VERSION}" == "" ]] ; then |
There was a problem hiding this comment.
One could also use local VERSION="${1:?}" above to check if the variable is set but I like the explicit error in here 👍
| if [[ -d "${i}" ]]; then | ||
| ( | ||
| cd "${i}" || exit 1 | ||
| PLUGIN_NAME="$(basename "${i}")" |
There was a problem hiding this comment.
Suggested change
| PLUGIN_NAME="$(basename "${i}")" | |
| local plugin_name="$(basename "${i}")" |
| cd "${i}" || exit 1 | ||
| PLUGIN_NAME="$(basename "${i}")" | ||
| # Strip everything after "-" (longest match) to avoid gem prerelease behavior | ||
| GEM_VERSION="${VERSION%%-*}" |
There was a problem hiding this comment.
Suggested change
| GEM_VERSION="${VERSION%%-*}" | |
| local gem_version="${version%%-*}" |
| function bundle_fluentd_plugins() { | ||
| local VERSION="${1}" | ||
|
|
||
| if [[ "${VERSION}" == "" ]] ; then |
There was a problem hiding this comment.
Suggested change
| if [[ "${VERSION}" == "" ]] ; then | |
| if [[ "${version}" == "" ]] ; then |
Comment on lines
+36
to
+38
| echo "Building gem ${PLUGIN_NAME} version ${GEM_VERSION} in $(pwd) ..." | ||
| sed -i.bak "s/0.0.0/${GEM_VERSION}/g" ./"${PLUGIN_NAME}".gemspec | ||
| rm -f ./"${PLUGIN_NAME}".gemspec.bak |
There was a problem hiding this comment.
Suggested change
| echo "Building gem ${PLUGIN_NAME} version ${GEM_VERSION} in $(pwd) ..." | |
| sed -i.bak "s/0.0.0/${GEM_VERSION}/g" ./"${PLUGIN_NAME}".gemspec | |
| rm -f ./"${PLUGIN_NAME}".gemspec.bak | |
| echo "Building gem ${plugin_name} version ${gem_version} in $(pwd) ..." | |
| sed -i.bak "s/0.0.0/${gem_version}/g" ./"${plugin_name}".gemspec | |
| rm -f ./"${plugin_Name}".gemspec.bak |
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.
Testing performed