mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Finish changes for new storage feed format

Browse source
This commit is contained in:
glennc 2015-10-28 18:45:11 -07:00
parent 8525dbdae3
commit 070037d6f4
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/dnvm2.ps1
View file

@ -85,7 +85,7 @@ Set-Variable -Option Constant "DefaultUserDirectoryName" ".dotnet"
Set-Variable -Option Constant "DefaultGlobalDirectoryName" "dotnet"
Set-Variable -Option Constant "OldUserDirectoryNames" @(".kre", ".k")
Set-Variable -Option Constant "RuntimePackageName" "dotnet"
Set-Variable -Option Constant "DefaultFeed" "https://distaspnet.blob.core.windows.net/dotnet"
Set-Variable -Option Constant "DefaultFeed" "https://dotnetcli.blob.core.windows.net/dotnet"
Set-Variable -Option Constant "DefaultFeedKey" "DNX_FEED"
Set-Variable -Option Constant "DefaultUnstableFeed" "https://aspdist.blob.core.windows.net/assets/dnvm/"
Set-Variable -Option Constant "DefaultUnstableFeedKey" "DNX_UNSTABLE_FEED"
@ -540,7 +540,7 @@ function Find-Package {
_WriteOut "Determining latest version"
$RuntimeId = $runtimeInfo.RuntimeId
_WriteDebug "Latest RuntimeId: $RuntimeId"
$url = Join-UrlFragments $Feed,$channel,"dnvm","latest.win"
$url = Join-UrlFragments $Feed,$channel,"dnvm","latest.win.index"
_WriteDebug "Index URL: $url"
$wc = New-Object System.Net.WebClient

8
scripts/dnvm2.sh
View file

@ -89,13 +89,13 @@ __dnvm_find_latest() {
#dnx-coreclr-linux-x64
local packageId="$_DNVM_RUNTIME_PACKAGE_NAME-$os-$arch"
local url="$DNX_ACTIVE_FEED/$DNX_ACTIVE_CHANNEL/dnvm/latest.$os"
local url="$DNX_ACTIVE_FEED/$DNX_ACTIVE_CHANNEL/dnvm/latest.$os.index"
local index="$(curl $url 2>/dev/null)"
local version="$(export IFS=; echo $index | sed -n 's/^.*dotnet-$os-$arch\.\(.*\)\.tar\.gz$/\1/p')"
local fullPackageId="$packageId.$version"
local version="$(export IFS=; echo $index | sed -n "s/^.*$packageId\.\(.*\)\.tar\.gz$/\1/p")"
local downloadUrl="$DNX_ACTIVE_FEED/$DNX_ACTIVE_CHANNEL/$index"
echo $version $downloadUrl
}
@ -521,7 +521,7 @@ dnvm()
if [[ "$versionOrAlias" == "latest" ]]; then
echo "Determining latest version"
read versionOrAlias downloadUrl < <(__dnvm_find_latest "$arch" "$os")
echo "DownoadURL: $downloadUrl"
echo "DownloadURL: $downloadUrl"
[[ $? == 1 ]] && echo "Error: Could not find latest version from feed $DNX_ACTIVE_FEED" && return 1
printf "%b\n" "Latest version is ${Cya}$versionOrAlias located at $downloadUrl${RCol}"
else