parent
9992c4ad36
commit
dd9ad89c51
10
dnvm.ps1
10
dnvm.ps1
|
|
@ -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
|
||||||
|
|
||||||
$Architecture = Get-PackageArch $BaseName
|
if(!$Architecture) {
|
||||||
$Runtime = Get-PackageRuntime $BaseName
|
$Architecture = Get-PackageArch $BaseName
|
||||||
|
}
|
||||||
|
if(!$Runtime) {
|
||||||
|
$Runtime = Get-PackageRuntime $BaseName
|
||||||
|
}
|
||||||
$Version = Get-PackageVersion $BaseName
|
$Version = Get-PackageVersion $BaseName
|
||||||
$OS = Get-PackageOS $BaseName
|
$OS = Get-PackageOS $BaseName
|
||||||
}
|
}
|
||||||
|
|
|
||||||
42
dnvm.sh
42
dnvm.sh
|
|
@ -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,24 +333,30 @@ __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")
|
||||||
echo "$runtimeFullName"
|
if [[ ! -n "$runtime" && ! -n "$arch" ]]; then
|
||||||
else
|
echo "$runtimeFullName"
|
||||||
local pkgVersion=$versionOrAlias
|
return
|
||||||
local pkgArchitecture="x64"
|
|
||||||
local pkgSystem=$os
|
|
||||||
|
|
||||||
if [[ -z $runtime || "$runtime" == "mono" ]]; then
|
|
||||||
echo "$_DNVM_RUNTIME_PACKAGE_NAME-mono.$pkgVersion"
|
|
||||||
else
|
|
||||||
if [ "$arch" != "" ]; then
|
|
||||||
local pkgArchitecture="$arch"
|
|
||||||
fi
|
|
||||||
if [ "$os" == "" ]; then
|
|
||||||
local pkgSystem=$(__dnvm_current_os)
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "$_DNVM_RUNTIME_PACKAGE_NAME-$runtime-$pkgSystem-$pkgArchitecture.$pkgVersion"
|
|
||||||
fi
|
fi
|
||||||
|
local pkgVersion=$(__dnvm_package_version "$runtimeFullName")
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ ! -n "$pkgVersion" ]]; then
|
||||||
|
local pkgVersion=$versionOrAlias
|
||||||
|
fi
|
||||||
|
local pkgArchitecture="x64"
|
||||||
|
local pkgSystem=$os
|
||||||
|
|
||||||
|
if [[ -z $runtime || "$runtime" == "mono" ]]; then
|
||||||
|
echo "$_DNVM_RUNTIME_PACKAGE_NAME-mono.$pkgVersion"
|
||||||
|
else
|
||||||
|
if [ "$arch" != "" ]; then
|
||||||
|
local pkgArchitecture="$arch"
|
||||||
|
fi
|
||||||
|
if [ "$os" == "" ]; then
|
||||||
|
local pkgSystem=$(__dnvm_current_os)
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "$_DNVM_RUNTIME_PACKAGE_NAME-$runtime-$pkgSystem-$pkgArchitecture.$pkgVersion"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue