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

Fix --without-components with subsetted components #119

Merged
merged 1 commit into from
Dec 21, 2022
Merged

Fix --without-components with subsetted components #119

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 20 additions & 2 deletions install-template.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -921,9 +921,27 @@ fi

if [ -n "$CFG_WITHOUT" ]; then
without_components="$(echo "$CFG_WITHOUT" | sed "s/,/ /g")"
for without_component in $without_components; do
components="$(echo "$components" | sed "s/$without_component//" | sed "s/$without_component//")"

# This does **not** check that all components in without_components are
# actually present in the list of available components.
#
# Currently that's considered good as it makes it easier to be compatible
# with multiple Rust versions (which may change the exact list of
# components) when writing install scripts.
new_comp=""
for component in $components; do
found=false
for my_component in $without_components; do
if [ "$component" = "$my_component" ]; then
found=true
fi
done
if [ "$found" = false ]; then
# If we didn't find the component in without, then add it to new list.
new_comp="$new_comp $component"
fi
done
components="$new_comp"
fi

if [ -z "$components" ]; then
Expand Down