⬆️ dnvm.ps1, dnvm.cmd, dnvm.sh

Source: aspnet/dnvm@0375986321
This commit is contained in:
ASP.NET Push Bot 2015-09-08 15:10:36 -07:00 committed by unknown
parent 9992c4ad36
commit dd9ad89c51
2 changed files with 32 additions and 22 deletions

View File

@ -67,7 +67,7 @@ function _WriteOut {
### Constants ### Constants
$ProductVersion="1.0.0" $ProductVersion="1.0.0"
$BuildVersion="beta8-15510" $BuildVersion="beta8-15511"
$Authors="Microsoft Open Technologies, Inc." $Authors="Microsoft Open Technologies, Inc."
# If the Version hasn't been replaced... # If the Version hasn't been replaced...
@ -400,8 +400,12 @@ function Get-RuntimeAliasOrRuntimeInfo(
if(Test-Path $aliasPath) { if(Test-Path $aliasPath) {
$BaseName = Get-Content $aliasPath $BaseName = Get-Content $aliasPath
if(!$Architecture) {
$Architecture = Get-PackageArch $BaseName $Architecture = Get-PackageArch $BaseName
}
if(!$Runtime) {
$Runtime = Get-PackageRuntime $BaseName $Runtime = Get-PackageRuntime $BaseName
}
$Version = Get-PackageVersion $BaseName $Version = Get-PackageVersion $BaseName
$OS = Get-PackageOS $BaseName $OS = Get-PackageOS $BaseName
} }

12
dnvm.sh
View File

@ -2,7 +2,7 @@
# Source this file from your .bash-profile or script to use # Source this file from your .bash-profile or script to use
# "Constants" # "Constants"
_DNVM_BUILDNUMBER="beta8-15510" _DNVM_BUILDNUMBER="beta8-15511"
_DNVM_AUTHORS="Microsoft Open Technologies, Inc." _DNVM_AUTHORS="Microsoft Open Technologies, Inc."
_DNVM_RUNTIME_PACKAGE_NAME="dnx" _DNVM_RUNTIME_PACKAGE_NAME="dnx"
_DNVM_RUNTIME_FRIENDLY_NAME=".NET Execution Environment" _DNVM_RUNTIME_FRIENDLY_NAME=".NET Execution Environment"
@ -333,9 +333,16 @@ __dnvm_requested_version_or_alias() {
else else
if [ -e "$_DNVM_ALIAS_DIR/$versionOrAlias.alias" ]; then if [ -e "$_DNVM_ALIAS_DIR/$versionOrAlias.alias" ]; then
local runtimeFullName=$(cat "$_DNVM_ALIAS_DIR/$versionOrAlias.alias") local runtimeFullName=$(cat "$_DNVM_ALIAS_DIR/$versionOrAlias.alias")
if [[ ! -n "$runtime" && ! -n "$arch" ]]; then
echo "$runtimeFullName" echo "$runtimeFullName"
else return
fi
local pkgVersion=$(__dnvm_package_version "$runtimeFullName")
fi
if [[ ! -n "$pkgVersion" ]]; then
local pkgVersion=$versionOrAlias local pkgVersion=$versionOrAlias
fi
local pkgArchitecture="x64" local pkgArchitecture="x64"
local pkgSystem=$os local pkgSystem=$os
@ -352,7 +359,6 @@ __dnvm_requested_version_or_alias() {
echo "$_DNVM_RUNTIME_PACKAGE_NAME-$runtime-$pkgSystem-$pkgArchitecture.$pkgVersion" echo "$_DNVM_RUNTIME_PACKAGE_NAME-$runtime-$pkgSystem-$pkgArchitecture.$pkgVersion"
fi fi
fi fi
fi
} }
# This will be more relevant if we support global installs # This will be more relevant if we support global installs