From 9992c4ad366548cc1c8d0d98069fd873904f7324 Mon Sep 17 00:00:00 2001 From: "ASP.NET Push Bot" Date: Tue, 8 Sep 2015 13:54:56 -0700 Subject: [PATCH] :arrow_up: dnvm.ps1, dnvm.cmd, dnvm.sh Source: aspnet/dnvm@c964d0fcebd1beec3ee026c9c041ee9f843240fa --- dnvm.ps1 | 2 +- dnvm.sh | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dnvm.ps1 b/dnvm.ps1 index 4f28d3a991..33a2075826 100644 --- a/dnvm.ps1 +++ b/dnvm.ps1 @@ -67,7 +67,7 @@ function _WriteOut { ### Constants $ProductVersion="1.0.0" -$BuildVersion="beta8-15509" +$BuildVersion="beta8-15510" $Authors="Microsoft Open Technologies, Inc." # If the Version hasn't been replaced... diff --git a/dnvm.sh b/dnvm.sh index 042f5a2d86..f4f22348ed 100644 --- a/dnvm.sh +++ b/dnvm.sh @@ -2,7 +2,7 @@ # Source this file from your .bash-profile or script to use # "Constants" -_DNVM_BUILDNUMBER="beta8-15509" +_DNVM_BUILDNUMBER="beta8-15510" _DNVM_AUTHORS="Microsoft Open Technologies, Inc." _DNVM_RUNTIME_PACKAGE_NAME="dnx" _DNVM_RUNTIME_FRIENDLY_NAME=".NET Execution Environment" @@ -778,7 +778,7 @@ dnvm() local name="$1" if [[ $# == 1 ]]; then - [[ ! -e "$_DNVM_ALIAS_DIR/$name.alias" ]] && echo "There is no alias called '$name'" && return + [[ ! -e "$_DNVM_ALIAS_DIR/$name.alias" ]] && echo "There is no alias called '$name'" && return 1 cat "$_DNVM_ALIAS_DIR/$name.alias" echo "" return @@ -832,10 +832,12 @@ dnvm() local runtimes="" for location in `echo $DNX_HOME | tr ":" "\n"`; do location+="/runtimes" - local oruntimes="$(find $location -name "$searchGlob" \( -type d -or -type l \) -prune -exec basename {} \;)" - for v in `echo $oruntimes | tr "\n" " "`; do - runtimes+="$v:$location"$'\n' - done + if [ -d "$location" ]; then + local oruntimes="$(find $location -name "$searchGlob" \( -type d -or -type l \) -prune -exec basename {} \;)" + for v in `echo $oruntimes | tr "\n" " "`; do + runtimes+="$v:$location"$'\n' + done + fi done [[ -z $runtimes ]] && echo 'No runtimes installed. You can run `dnvm install latest` or `dnvm upgrade` to install a runtime.' && return @@ -939,4 +941,4 @@ dnvm() [[ ":$PATH:" != *":$DNX_USER_HOME/bin:"* ]] && export PATH="$DNX_USER_HOME/bin:$PATH" # Generate the command function using the constant defined above. -$_DNVM_COMMAND_NAME list default >/dev/null && $_DNVM_COMMAND_NAME use default >/dev/null || true +$_DNVM_COMMAND_NAME alias default >/dev/null && $_DNVM_COMMAND_NAME use default >/dev/null || true