dotnet/update.sh: move substitutions to avoid loss of errors
This commit is contained in:
parent
496c9cf685
commit
9cc5673665
1 changed files with 12 additions and 5 deletions
|
@ -359,6 +359,13 @@ Examples:
|
||||||
channel_version=$(jq -r '."channel-version"' <<< "$content")
|
channel_version=$(jq -r '."channel-version"' <<< "$content")
|
||||||
support_phase=$(jq -r '."support-phase"' <<< "$content")
|
support_phase=$(jq -r '."support-phase"' <<< "$content")
|
||||||
|
|
||||||
|
aspnetcore_sources="$(platform_sources "$aspnetcore_files")"
|
||||||
|
runtime_sources="$(platform_sources "$runtime_files")"
|
||||||
|
sdk_sources="$(platform_sources "$sdk_files")"
|
||||||
|
|
||||||
|
aspnetcore_packages="$(aspnetcore_packages "${aspnetcore_version}")"
|
||||||
|
sdk_packages="$(sdk_packages "${runtime_version}")"
|
||||||
|
|
||||||
result=$(mktemp)
|
result=$(mktemp)
|
||||||
trap "rm -f $result" TERM INT EXIT
|
trap "rm -f $result" TERM INT EXIT
|
||||||
|
|
||||||
|
@ -368,20 +375,20 @@ Examples:
|
||||||
{
|
{
|
||||||
aspnetcore_$major_minor_underscore = buildAspNetCore {
|
aspnetcore_$major_minor_underscore = buildAspNetCore {
|
||||||
version = \"${aspnetcore_version}\";
|
version = \"${aspnetcore_version}\";
|
||||||
$(platform_sources "$aspnetcore_files")
|
$aspnetcore_sources
|
||||||
};
|
};
|
||||||
|
|
||||||
runtime_$major_minor_underscore = buildNetRuntime {
|
runtime_$major_minor_underscore = buildNetRuntime {
|
||||||
version = \"${runtime_version}\";
|
version = \"${runtime_version}\";
|
||||||
$(platform_sources "$runtime_files")
|
$runtime_sources
|
||||||
};
|
};
|
||||||
|
|
||||||
sdk_$major_minor_underscore = buildNetSdk {
|
sdk_$major_minor_underscore = buildNetSdk {
|
||||||
version = \"${sdk_version}\";
|
version = \"${sdk_version}\";
|
||||||
$(platform_sources "$sdk_files")
|
$sdk_sources
|
||||||
packages = { fetchNuGet }: [
|
packages = { fetchNuGet }: [
|
||||||
$(aspnetcore_packages "${aspnetcore_version}")
|
$aspnetcore_packages
|
||||||
$(sdk_packages "${runtime_version}")
|
$sdk_packages
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}" > "${result}"
|
}" > "${result}"
|
||||||
|
|
Loading…
Reference in a new issue