Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make bootstrap.sh more friendly to other shells. #27392

Merged
merged 8 commits into from
Jun 21, 2023
Merged

Make bootstrap.sh more friendly to other shells. #27392

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cd7b788
Make bootstrap.sh more friendly to other shells.
andy31415 Jun 21, 2023
321b2d3
Restyle
andy31415 Jun 21, 2023
74e5e04
Remove quoting logic that breaks execution
andy31415 Jun 21, 2023
efbfaa4
Stop restyling bootstrap.sh
andy31415 Jun 21, 2023
cb6f86c
Fix path
andy31415 Jun 21, 2023
6195292
Do not permanently alter zsh options, use local_options
andy31415 Jun 21, 2023
c4f8339
update sh_word_split to shwordsplit. Both seem to work, the non-under…
andy31415 Jun 21, 2023
e3c3880
Merge branch 'master' into make_dash_bootstrap_work
andy31415 Jun 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions scripts/setup/bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ _install_additional_pip_requirements() {
shift

# figure out additional pip install items
while [[ $# -gt 0 ]]; do
while [ $# -gt 0 ]; do
case $1 in
-p | --platform)
_SETUP_PLATFORM=$2
Expand All @@ -32,13 +32,14 @@ _install_additional_pip_requirements() {
esac
done

if ! [ -z "$_SETUP_PLATFORM" ]; then
if [ -n "$_SETUP_PLATFORM" ]; then
_OLD_IFS=$IFS
IFS=","
if [ -n "$ZSH_VERSION" ]; then
IFS="," read -r -A _PLATFORMS <<<"$_SETUP_PLATFORM"
else
IFS="," read -r -a _PLATFORMS <<<"$_SETUP_PLATFORM"
setopt sh_word_split
fi
for platform in "${_PLATFORMS[@]}"; do

for platform in "$_SETUP_PLATFORM"; do
# Allow none as an alias of nothing extra installed (like -p none)
if [ "$platform" != "none" ]; then
echo "Installing pip requirements for $platform..."
Expand All @@ -47,6 +48,8 @@ _install_additional_pip_requirements() {
-c "$_CHIP_ROOT/scripts/setup/constraints.txt"
fi
done
IFS=$_OLD_IFS
unset _OLD_IFS
unset _PLATFORMS
fi

Expand Down