[repo_update] Address shellcheck issues, simplify pushd+LINK logic #130
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
We will be comparing picked commits/reverts and silently skip them if already applied (only if applied on top of the selected manifest tag), but for that both diff and context must be identical (even if using patch-id). The ipacfg-mgr patch has been re-pushed on top of the current tag to have this matching context again. Signed-off-by: Marijn Suijten <[email protected]>
Introduce a function that takes a path which is also used to construct the fetch URL. Takes a second optional argument in case the path differs from the fetch URL, as is the case with ipacfg-mgr. This also hides bloaty LINK=$HTTP && LINK+= logic. Signed-off-by: Marijn Suijten <[email protected]>
Prevent leaking function-local variables outside which may unintentionally hide other bugs with "disastrous" results. Signed-off-by: Marijn Suijten <[email protected]>
No argument is ever (supposed to be) passed to popd, so omit it. Signed-off-by: Marijn Suijten <[email protected]>
Signed-off-by: Marijn Suijten <[email protected]>
Signed-off-by: Marijn Suijten <[email protected]>
ix5
reviewed
Jun 5, 2020
|
|
||
| [ "$ANDROOT" != "$PWD" ] && echo "WARNING: enter_aosp_dir was not called from $ANDROOT. Please fix the script to call popd after every block of patches!" | ||
|
|
||
| LINK="$HTTP://android.googlesource.com/platform/${2:-$1}" |
There was a problem hiding this comment.
By the way, we may want to modify device/sample or some other repo that doesn't start with platform/.
But that's for another day when we actually need it.
There was a problem hiding this comment.
But that's for another day when we actually need it.
Exactly my thought. Simplify where possible, refactor when necessary.
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.
This is an excerpt from #128 containing cleanups and style improvements only. All the functional work on re-entrancy has been dropped, as that needs more time and discussion (and is, for what it's worth, already a far too massive timesink). See that PR for some of the review comments and suggestions.
Most notably this introduces a new function to deduplicate pushd+LINK= logic, whose arguments are always identical except one repository.