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

Change blob storage account and layout

Browse source
This commit is contained in:
glennc 2015-10-21 17:28:04 -07:00
parent 8ca5740ce0
commit 31facfac6e
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
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 "DefaultGlobalDirectoryName" "dotnet"
Set-Variable -Option Constant "OldUserDirectoryNames" @(".kre", ".k") Set-Variable -Option Constant "OldUserDirectoryNames" @(".kre", ".k")
Set-Variable -Option Constant "RuntimePackageName" "dotnet" Set-Variable -Option Constant "RuntimePackageName" "dotnet"
Set-Variable -Option Constant "DefaultFeed" "https://aspdist.blob.core.windows.net/assets/dnvm/" Set-Variable -Option Constant "DefaultFeed" "https://distaspnet.blob.core.windows.net/dotnet"
Set-Variable -Option Constant "DefaultFeedKey" "DNX_FEED" Set-Variable -Option Constant "DefaultFeedKey" "DNX_FEED"
Set-Variable -Option Constant "DefaultUnstableFeed" "https://aspdist.blob.core.windows.net/assets/dnvm/" Set-Variable -Option Constant "DefaultUnstableFeed" "https://aspdist.blob.core.windows.net/assets/dnvm/"
Set-Variable -Option Constant "DefaultUnstableFeedKey" "DNX_UNSTABLE_FEED" Set-Variable -Option Constant "DefaultUnstableFeedKey" "DNX_UNSTABLE_FEED"
@ -540,7 +540,7 @@ function Find-Package {
_WriteOut "Determining latest version" _WriteOut "Determining latest version"
$RuntimeId = $runtimeInfo.RuntimeId $RuntimeId = $runtimeInfo.RuntimeId
_WriteDebug "Latest RuntimeId: $RuntimeId" _WriteDebug "Latest RuntimeId: $RuntimeId"
$url = Join-UrlFragments $Feed,"channels","$channel","index" $url = Join-UrlFragments $Feed,$channel,"dnvm","index"
_WriteDebug "Index URL: $url" _WriteDebug "Index URL: $url"
$wc = New-Object System.Net.WebClient $wc = New-Object System.Net.WebClient
@ -562,7 +562,7 @@ function Find-Package {
if($version) { if($version) {
$urlPart = $index | ?{$_ -match "Filename: (?<url>.+?$RuntimeId.$version.zip)"} | %{$matches["url"]} $urlPart = $index | ?{$_ -match "Filename: (?<url>.+?$RuntimeId.$version.zip)"} | %{$matches["url"]}
_WriteDebug "Found Package Path: $urlPart" _WriteDebug "Found Package Path: $urlPart"
$downloadUrl = Join-UrlFragments $Feed,$urlPart $downloadUrl = Join-UrlFragments $Feed,$channel,$urlPart
_WriteDebug "Found $version at $downloadUrl" _WriteDebug "Found $version at $downloadUrl"
@{ Version = $version; DownloadUrl = $downloadUrl } @{ Version = $version; DownloadUrl = $downloadUrl }
} else { } else {
@ -1221,7 +1221,7 @@ function dnvm-install {
} else { } else {
_WriteOut -ForegroundColor $ColorScheme.Warning "Default stable feed ($DefaultFeed) is being overridden by the value of the $DefaultFeedKey environment variable ($ActiveFeed)" _WriteOut -ForegroundColor $ColorScheme.Warning "Default stable feed ($DefaultFeed) is being overridden by the value of the $DefaultFeedKey environment variable ($ActiveFeed)"
} }
$activeChannel="unstable" $activeChannel="dev"
} }
if(!$VersionNuPkgOrAlias) { if(!$VersionNuPkgOrAlias) {

12
scripts/dnvm2.sh
View file

@ -11,8 +11,8 @@ _DNVM_RUNTIME_FOLDER_NAME=".dotnet"
_DNVM_COMMAND_NAME="dnvm" _DNVM_COMMAND_NAME="dnvm"
_DNVM_PACKAGE_MANAGER_NAME="dnu" _DNVM_PACKAGE_MANAGER_NAME="dnu"
_DNVM_VERSION_MANAGER_NAME=".NET Version Manager" _DNVM_VERSION_MANAGER_NAME=".NET Version Manager"
_DNVM_DEFAULT_FEED="https://aspdist.blob.core.windows.net/assets/dnvm" _DNVM_DEFAULT_FEED="https://distaspnet.blob.core.windows.net/dotnet"
_DNVM_DEFAULT_CHANNEL="unstable" _DNVM_DEFAULT_CHANNEL="dev"
_DNVM_DEFAULT_UNSTABLE_CHANNEL="dev" _DNVM_DEFAULT_UNSTABLE_CHANNEL="dev"
_DNVM_UPDATE_LOCATION="https://raw.githubusercontent.com/aspnet/Home/dev/dnvm.sh" _DNVM_UPDATE_LOCATION="https://raw.githubusercontent.com/aspnet/Home/dev/dnvm.sh"
_DNVM_INSTALL_SUBFOLDER="sdks" _DNVM_INSTALL_SUBFOLDER="sdks"
@ -89,14 +89,14 @@ __dnvm_find_latest() {
#dnx-coreclr-linux-x64 #dnx-coreclr-linux-x64
local packageId="$_DNVM_RUNTIME_PACKAGE_NAME-$os-$arch" local packageId="$_DNVM_RUNTIME_PACKAGE_NAME-$os-$arch"
local url="$DNX_ACTIVE_FEED/channels/$DNX_ACTIVE_CHANNEL/index" local url="$DNX_ACTIVE_FEED/$DNX_ACTIVE_CHANNEL/dnvm/index"
local index="$(curl $url 2>/dev/null)" local index="$(curl $url 2>/dev/null)"
local version="$(export IFS=; echo $index | sed -n 's/Latest: \(.*\)/\1/p')" local version="$(export IFS=; echo $index | sed -n 's/Latest: \(.*\)/\1/p')"
local fullPackageId="$packageId.$version" local fullPackageId="$packageId.$version"
local filename="$(export IFS=; echo $index | sed -n "s/Filename: \(.*$fullPackageId\)/\1/p")" local filename="$(export IFS=; echo $index | sed -n "s/Filename: \(.*$fullPackageId\)/\1/p")"
local downloadUrl="$DNX_ACTIVE_FEED/$filename" local downloadUrl="$DNX_ACTIVE_FEED/$DNX_ACTIVE_CHANNEL/$filename"
echo $version $downloadUrl echo $version $downloadUrl
} }
@ -108,11 +108,11 @@ __dnvm_find_package() {
#dnx-coreclr-linux-x64 #dnx-coreclr-linux-x64
local packageId="$_DNVM_RUNTIME_PACKAGE_NAME-$os-$arch" local packageId="$_DNVM_RUNTIME_PACKAGE_NAME-$os-$arch"
local url="$DNX_ACTIVE_FEED/channels/$_DNVM_DEFAULT_CHANNEL/index" local url="$DNX_ACTIVE_FEED/$DNX_ACTIVE_CHANNEL/dnvm/index"
local index="$(curl $url 2>/dev/null)" local index="$(curl $url 2>/dev/null)"
local filename="$(export IFS=; echo $index | sed -n "s/Filename: \(.*$packageId.$version\)/\1/p")" local filename="$(export IFS=; echo $index | sed -n "s/Filename: \(.*$packageId.$version\)/\1/p")"
local packageUrl="$DNX_ACTIVE_FEED/$filename" local packageUrl="$DNX_ACTIVE_FEED/$DNX_ACTIVE_CHANNEL/$filename"
echo $packageUrl echo $packageUrl
} }