gh-129156: Fix variable quoting in android-env.sh script
#129321
Conversation
|
Tested with |
| if [ $(uname) = "Darwin" ]; then | ||
| export CPU_COUNT=$(sysctl -n hw.ncpu) | ||
| if [ "$(uname)" = "Darwin" ]; then | ||
| CPU_COUNT="$(sysctl -n hw.ncpu)" | ||
| export CPU_COUNT | ||
| else | ||
| export CPU_COUNT=$(nproc) | ||
| CPU_COUNT="$(nproc)" | ||
| export CPU_COUNT |
There was a problem hiding this comment.
The export is separated from the assignment as a failed command would be ignored otherwise (see https://www.shellcheck.net/wiki/SC2155)
zanieb
force-pushed
the
zb/android-env
branch
from
49c57f7 to
1978ae5
Compare
|
It'd still be nice to test against the shell in the report, but I couldn't reproduce the failure they described with several shells. |
|
!buildbot android |
There was a problem hiding this comment.
Looks good to me. Thanks for the fixes!
@freakboy3742: If you're happy, please merge and backport.
|
Thanks @zanieb for the PR, and @freakboy3742 for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13. |
|
Sorry, @zanieb and @freakboy3742, I could not cleanly backport this to |
…pt (pythonGH-129321) Adds quoting to `android-env.sh` to protect against spaces in paths. (cherry picked from commit a49225c) Co-authored-by: Zanie Blue <[email protected]>
|
GH-129332 is a backport of this pull request to the 3.13 branch. |
…-129321) (#129332) Adds quoting to `android-env.sh` to protect against spaces in paths. (cherry picked from commit a49225c) Co-authored-by: Zanie Blue <[email protected]>
As reported in #129156, the lack of quoting can cause problems.
I added quoting to variables throughout the script. I used
shellcheckto confirm that there were not remaining cases.