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

Append version to RID only with valid characters #81497

Merged
merged 3 commits into from
Mar 2, 2023
Merged

Append version to RID only with valid characters #81497

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59e85c6
Append version to RID only with valid characters
am11 Feb 1, 2023
22c8ea4
Indent with four spaces
am11 Feb 1, 2023
50e376a
Reverse condition to simplify
am11 Feb 1, 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
11 changes: 6 additions & 5 deletions eng/native/init-distro-rid.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,13 @@ initNonPortableDistroRid()
VERSION_ID="${VERSION_ID%.*}"
fi

if [ -z "${VERSION_ID+x}" ]; then
# Rolling release distros do not set VERSION_ID, so omit
# it here to be consistent with everything else.
nonPortableBuildID="${ID}-${buildArch}"
if [[ "${VERSION_ID}" =~ ^([[:digit:]]|\.)+$ ]]; then
nonPortableBuildID="${ID}.${VERSION_ID}-${buildArch}"
else
nonPortableBuildID="${ID}.${VERSION_ID}-${buildArch}"
# Rolling release distros either do not set VERSION_ID, set it as blank or
# set it to non-version looking string (such as TEMPLATE_VERSION_ID on ArchLinux);
# so omit it here to be consistent with everything else.
nonPortableBuildID="${ID}-${buildArch}"
fi
fi

Expand Down