From 4d5b16f25f3c2015f504ef5e65a8be44ddd5d190 Mon Sep 17 00:00:00 2001
From: Graeme Christie <graeme@sx.net.au>
Date: Sat, 24 May 2014 01:00:21 +0800
Subject: [PATCH 01/26] Initial drop of kvm shell script

---
 kvm.sh | 196 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 196 insertions(+)
 create mode 100644 kvm.sh

diff --git a/kvm.sh b/kvm.sh
new file mode 100644
index 0000000000..6a098a461f
--- /dev/null
+++ b/kvm.sh
@@ -0,0 +1,196 @@
+# kvm.sh
+# Source this file from you .bash-profile or script to use
+# With inspriation from nvm.sh
+
+SCRIPTPATH="$_"
+
+_kvm_has() {
+  type "$1" > /dev/null 2>&1
+  return $?
+}
+
+# Make zsh glob matching behave same as bash
+# This fixes the "zsh: no matches found" errors
+if _kvm_has "unsetopt"; then
+  unsetopt nomatch 2>/dev/null
+  KVM_CD_FLAGS="-q"
+fi
+
+USERKREPATH="~/.kre"
+USERKREPACKAGES="$USERKREPATH/packages"
+
+# Traverse up in directory tree to find containing folder
+_kvm_find_up() {
+  local path
+  path=$PWD
+  while [ "$path" != "" ] && [ ! -f "$path/$1" ]; do
+    path=${path%/*}
+  done
+  echo "$path"
+}
+
+_kvm_find_kvmrc() {
+  local dir="$(_kvm_find_up '.kvmrc')"
+  if [ -e "$dir/.kvmrc" ]; then
+        echo "$dir/.kvmrc"
+  fi
+}
+
+# Obtain kvm version from rc file
+_kvm_rc_version() {
+  local KVMRC_PATH="$(_kvm_find_kvmrc)"
+  if [ -e "$KVMRC_PATH" ]; then
+    _kvm_rc_version=`cat "$KVMRC_PATH" | head -n 1`
+    echo "Found '$KVMRC_PATH' with version <$_kvm_rc_version>"
+  fi
+}
+
+_kvm_find_latest() {
+  echo "Determining latest version"
+
+  local platform="mono45"
+  local architecture="x86"
+
+  if ! _kvm_has "curl"; then
+    echo 'KVM Needs curl to proceed.' >&2;
+    return 1
+  fi
+
+  local url="https://www.myget.org/F/aspnetvnext/api/v2/GetUpdates()?packageIds=%27KRE-$platform-$architecture%27&versions=%270.0%27&includePrerelease=true&includeAllVersions=false"
+  local xml=$(curl -silent -u aspnetreadonly:4d8a2d9c-7b80-4162-9978-47e918c9658c $url)
+
+  version=$(echo $xml | sed "s/.*<[a-zA-Z]:Version>\([^<]*\).*/\1/")
+
+  echo $version
+}
+
+_kvm_strip_path() {
+  echo "$1" | sed -e "s#$KVM_DIR/[^/]*$2[^:]*:##g" -e "s#:$KVM_DIR/[^/]*$2[^:]*##g" -e "s#$KVM_DIR/[^/]*$2[^:]*##g"
+}
+
+_kvm_prepend_path() {
+  if [ -z "$1" ]; then
+    echo "$2"
+  else
+    echo "$2:$1"
+  fi
+}
+
+_kvm_download() {
+  local packageName="$1"
+  local destinationFolder="$2"
+  echo "download $packageName $destinationFolder - TBD"
+}
+
+_kvm_unpack() {
+  local file="$1"
+  local destinationFolder="$2"
+  echo "unpack $file $destinationFolder - TBD"
+}
+
+_kvm_requested_version_or_alias() {
+  local versionOrAlias="$1"
+  echo "Requested version or alias $versionOrAlias - TBD"
+}
+
+kvm()
+{
+  if [ $# -lt 1 ]; then
+    kvm help
+    return
+  fi
+
+  case $1 in
+    "help" )
+      echo ""
+      echo "K Runtime Environment Version Manager - Build {{BUILD_NUMBER}}"
+      echo ""
+      echo "USAGE: kvm <command> [options]"
+      echo ""
+      echo "kvm upgrade"
+      echo "install latest KRE from feed"
+      echo "set 'default' alias to installed version"
+      echo "add KRE bin to user PATH environment variable persistently"
+      echo ""
+      echo "kvm install <semver>|<alias>|<nupkg>"
+      echo "install requested KRE from feed"
+      echo "add KRE bin to path of current command line"
+      echo ""
+      echo "kvm use <semver>|<alias>|none [-p --persistent]"
+      echo "<semver>|<alias>  add KRE bin to path of current command line   "
+      echo "none              remove KRE bin from path of current command line"
+      echo "-p --persistent   persist selected version to .kvmrc"
+      echo ""
+      echo "kvm list"
+      echo "list KRE versions installed "
+      echo ""
+      echo "kvm alias"
+      echo "list KRE aliases which have been defined"
+      echo ""
+      echo "kvm alias <alias>"
+      echo "display value of named alias"
+      echo ""
+      echo "kvm alias <alias> <semver>"
+      echo "set alias to specific version"
+      echo ""
+      echo ""
+    ;;
+
+    "upgrade" )
+      [ $# -ne 1 ] && kvm help && return
+
+      local version=$(_kvm_find_latest mono45 x86)
+      kvm install $version
+      kvm alias default $version
+    ;;
+
+    "install" )
+      [ $# -ne 2 ] && kvm help && return
+
+      local versionOrAlias="$2"
+
+      if [ "$versionOrAlias" == *.nupkg ]; then
+        local kreFullName=$(echo $versionOrAlias | sed "s/\(.*\)\.nupkg/\1/")
+        local kreFolder="$USERKREPACKAGES/$kreFullName"
+        local kreFile="$kreFolder/$kreFullName.nupkg"
+
+        if [ -e "$kreFolder" ]; then
+          echo "Target folder '$kreFolder' already exists"
+        else
+          mkdir "$kreFolder" > /dev/null 2>&1
+          cp -a "$versionOrAlias" "$kreFile"
+          _kvm_unpack "$kreFile" "$kreFolder"
+        fi
+
+        echo "Adding $kreBin to current PATH"
+
+        # Strip other version from PATH
+        PATH=`_kvm_strip_path "$PATH" "/bin"`
+        # Prepend current version
+        PATH=`_kvm_prepend_path "$PATH" "$kreBin"`
+      else
+        local kreFullName="$(_kvm_requested_version_or_alias $versionOrAlias)"
+        local kreFolder="$USERKREPACKAGES/$kreFullName"
+
+        _kvm_download "$kreFullName" "$kreFolder"
+        kvm use "$versionOrAlias"
+      fi
+    ;;
+
+    "use" )
+      [ $# -gt 3 ] && kvm help && return
+      [ $# -lt 2 ] && kvm help && return
+      local version="$2"
+      local persist="$3"
+      echo "use $version - TBD ... "
+    ;;
+
+    "alias" )
+      [ $# -gt 4 ] && kvm help && return
+
+      local alias="$2"
+      local semver="$3"
+
+      echo "alias $alias $semver - TBD ..."
+  esac
+}

From ff41e7d7439cc47d206e78cee5da3f9c3833859b Mon Sep 17 00:00:00 2001
From: Graeme Christie <graeme@sx.net.au>
Date: Sat, 24 May 2014 16:01:02 +0800
Subject: [PATCH 02/26] Implemented kvm install and kvm use

---
 kvm.sh | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 151 insertions(+), 19 deletions(-)

diff --git a/kvm.sh b/kvm.sh
index 6a098a461f..5974ef378c 100644
--- a/kvm.sh
+++ b/kvm.sh
@@ -1,9 +1,14 @@
 # kvm.sh
-# Source this file from you .bash-profile or script to use
+# Source this file from your .bash-profile or script to use
 # With inspriation from nvm.sh
 
 SCRIPTPATH="$_"
 
+#Exit script when any command returns non 0 exit code
+
+set -e
+set -o pipefail
+
 _kvm_has() {
   type "$1" > /dev/null 2>&1
   return $?
@@ -16,8 +21,11 @@ if _kvm_has "unsetopt"; then
   KVM_CD_FLAGS="-q"
 fi
 
-USERKREPATH="~/.kre"
+eval USERKREPATH=~/.kre
 USERKREPACKAGES="$USERKREPATH/packages"
+MONO45=
+X86=
+X64=
 
 # Traverse up in directory tree to find containing folder
 _kvm_find_up() {
@@ -57,7 +65,7 @@ _kvm_find_latest() {
   fi
 
   local url="https://www.myget.org/F/aspnetvnext/api/v2/GetUpdates()?packageIds=%27KRE-$platform-$architecture%27&versions=%270.0%27&includePrerelease=true&includeAllVersions=false"
-  local xml=$(curl -silent -u aspnetreadonly:4d8a2d9c-7b80-4162-9978-47e918c9658c $url)
+  local xml=$(curl -silent -L -u aspnetreadonly:4d8a2d9c-7b80-4162-9978-47e918c9658c $url)
 
   version=$(echo $xml | sed "s/.*<[a-zA-Z]:Version>\([^<]*\).*/\1/")
 
@@ -77,20 +85,99 @@ _kvm_prepend_path() {
 }
 
 _kvm_download() {
-  local packageName="$1"
-  local destinationFolder="$2"
-  echo "download $packageName $destinationFolder - TBD"
+  local kreFullName="$1"
+  local kreFolder="$2"
+
+  local pkgName=$(echo "$kreFullName" | sed "s/\([^.]*\).*/\1/")
+  local pkgVersion=$(echo "$kreFullName" | sed "s/[^.]*.\(.*\)/\1/")
+  local url="https://www.myget.org/F/aspnetvnext/api/v2/package/$pkgName/$pkgVersion"
+  local kreFile="$kreFolder/$kreFullName.nupkg"
+
+  if [ -e "$kreFolder" ]; then
+    echo "$kreFullName already installed."
+    return 0
+  fi
+
+  echo "Downloading" $kreFullName "from https://www.myget.org/F/aspnetvnext/api/v2/"
+
+  if ! _kvm_has "curl"; then
+    echo "KVM Needs curl to proceed." >&2;
+    return 1
+  fi
+
+  mkdir -p "$kreFolder" > /dev/null 2>&1
+
+  curl -silent -L -u aspnetreadonly:4d8a2d9c-7b80-4162-9978-47e918c9658c "$url" -o "$kreFile"
+
+  _kvm_unpack $kreFile $kreFolder
 }
 
 _kvm_unpack() {
-  local file="$1"
-  local destinationFolder="$2"
-  echo "unpack $file $destinationFolder - TBD"
+  local kreFile="$1"
+  local kreFolder="$2"
+
+  echo "Installing to $kreFolder"
+
+  if ! _kvm_has "unzip"; then
+    echo "KVM Needs unzip to proceed." >&2;
+    return 1
+  fi
+
+  unzip $kreFile -d $kreFolder > /dev/null 2>&1
+
+  [ -e "$kreFolder/[Content_Types].xml" ] && rm "$kreFolder/[Content_Types].xml"
+
+  [ -e "$kreFolder/_rels/" ] && rm -rf "$kreFolder/_rels/"
+
+  [ -e "$kreFolder/package/" ] && rm -rf "$kreFolder/_package/"
+
+}
+
+# This is not really needed. Placeholder until I get clarification on the supported platforms for mono
+_kvm_requested_platform() {
+  local default=$1
+
+  [[ $MONO45 ]] && echo "mono45" && return
+
+  echo $default
+}
+
+# Ditto - waiting for clarification on mono-x64 packages
+_kvm_requested_architecture() {
+  local default=$1
+
+  [[ $X86 && $X64 ]] && echo "This command cannot accept both -x86 and -x64" && return 1
+
+  [[ $X86 ]] && echo "x86" && return
+
+  [[ $X64 ]] && echo "x64" && return
+
+  echo $default
 }
 
 _kvm_requested_version_or_alias() {
   local versionOrAlias="$1"
-  echo "Requested version or alias $versionOrAlias - TBD"
+
+  if [ -e "$USERKREPATH/alias/$versionOrAlias.alias" ]; then
+    local aliasValue=$(cat "$USERKREPATH/alias/$versionOrAlias.alias")
+    local pkgName=$(echo $kreFullName | sed "s/\([^.]*\).*/\1/")
+    local pkgVersion=$(echo $kreFullName | sed "s/[^.]*\(.*\)/\1/")
+    local pkgPlatform=$(echo $pgkName | sed "s/.*-\([^-]*\).*/\1/" | _kvm_requested_platform)
+    local pkgArchitecture=$(echo $pgkName | sed "s/.*-.*-\([^-]*\).*/\1/" | _kvm_requested_architecture)
+  else
+    local pkgVersion=$versionOrAlias
+    local pkgPlatform=$(_kvm_requested_platform "mono45")
+    local pkgArchitecture=$(_kvm_requested_architecture "x86")
+  fi
+
+  echo "KRE-$pkgPlatform-$pkgArchitecture.$pkgVersion"
+}
+
+# This will be more relevant if we support global installs
+_kvm_locate_kre_bin_from_full_name() {
+  local kreFullName=$1
+
+  [ -e "$USERKREPACKAGES/$kreFullName/bin" ] && echo "$USERKREPACKAGES/$kreFullName/bin" && return
 }
 
 kvm()
@@ -116,10 +203,10 @@ kvm()
       echo "install requested KRE from feed"
       echo "add KRE bin to path of current command line"
       echo ""
-      echo "kvm use <semver>|<alias>|none [-p --persistent]"
+      echo "kvm use <semver>|<alias>|none [-p -persistent]"
       echo "<semver>|<alias>  add KRE bin to path of current command line   "
       echo "none              remove KRE bin from path of current command line"
-      echo "-p --persistent   persist selected version to .kvmrc"
+      echo "-p -persistent   persist selected version to .kvmrc"
       echo ""
       echo "kvm list"
       echo "list KRE versions installed "
@@ -163,15 +250,11 @@ kvm()
         fi
 
         echo "Adding $kreBin to current PATH"
-
-        # Strip other version from PATH
         PATH=`_kvm_strip_path "$PATH" "/bin"`
-        # Prepend current version
         PATH=`_kvm_prepend_path "$PATH" "$kreBin"`
       else
         local kreFullName="$(_kvm_requested_version_or_alias $versionOrAlias)"
         local kreFolder="$USERKREPACKAGES/$kreFullName"
-
         _kvm_download "$kreFullName" "$kreFolder"
         kvm use "$versionOrAlias"
       fi
@@ -180,9 +263,50 @@ kvm()
     "use" )
       [ $# -gt 3 ] && kvm help && return
       [ $# -lt 2 ] && kvm help && return
-      local version="$2"
-      local persist="$3"
-      echo "use $version - TBD ... "
+
+      shift
+      local persistant=
+
+      while [ $# -ne 0 ]
+      do
+        if [[ $1 == "-p" || $1 == "-persistant" ]]; then
+          local persistant="true"
+        else
+          local versionOrAlias=$1
+        fi
+        shift
+      done
+
+      if [[ $versionOrAlias == "none" ]]; then
+        echo "Removing KRE from process PATH"
+        # Strip other version from PATH
+        PATH=`_kvm_strip_path "$PATH" "/bin"`
+
+        if [[ $persistent&& -e "$USERKREPATH/alias/default.alias" ]]; then
+            echo "Setting default KRE to none"
+
+            rm "$USERKREPATH/alias/default.alias"
+        fi
+        return 0
+      fi
+
+      local kreFullName=$(_kvm_requested_version_or_alias "$versionOrAlias")
+      local kreBin=$(_kvm_locate_kre_bin_from_full_name "$kreFullName")
+
+      if [[ ! $kreBin ]]; then
+        echo "Cannot find $kreFullName, do you need to run 'kvm install $versionOrAlias'?"
+        return 1
+      fi
+
+      echo "Adding" $kreBin "to process PATH"
+
+      PATH=`_kvm_strip_path "$PATH" "/bin"`
+      PATH=`_kvm_prepend_path "$PATH" "$kreBin"`
+
+      if [[ $persistent ]]; then
+          echo "Setting  $kreBin as default KRE"
+          kvm alias default "$versionOrAlias"
+      fi
     ;;
 
     "alias" )
@@ -192,5 +316,13 @@ kvm()
       local semver="$3"
 
       echo "alias $alias $semver - TBD ..."
+
+    ;;
+    "list" )
+      # TBD, this lets our persistant impl work for now
+      echo "default"
+      echo ""
   esac
 }
+
+kvm list default >/dev/null && kvm use default >/dev/null || true

From aa1fed24f626cf5eb649163c1b1c185c89b2e59a Mon Sep 17 00:00:00 2001
From: Graeme Christie <graeme@sx.net.au>
Date: Sun, 25 May 2014 01:25:58 +0800
Subject: [PATCH 03/26] Implemented alias functionality Implemented use
 functionality fixed download of files - added check requested version exists
 modified unpack to set shell scripts as executable

---
 kvm.sh | 55 +++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 39 insertions(+), 16 deletions(-)

diff --git a/kvm.sh b/kvm.sh
index 5974ef378c..42d20a962e 100644
--- a/kvm.sh
+++ b/kvm.sh
@@ -6,9 +6,6 @@ SCRIPTPATH="$_"
 
 #Exit script when any command returns non 0 exit code
 
-set -e
-set -o pipefail
-
 _kvm_has() {
   type "$1" > /dev/null 2>&1
   return $?
@@ -21,11 +18,13 @@ if _kvm_has "unsetopt"; then
   KVM_CD_FLAGS="-q"
 fi
 
+
 eval USERKREPATH=~/.kre
 USERKREPACKAGES="$USERKREPATH/packages"
 MONO45=
 X86=
 X64=
+NUGETAPIURL="https://www.myget.org/F/aspnetvnext/api/v2"
 
 # Traverse up in directory tree to find containing folder
 _kvm_find_up() {
@@ -54,8 +53,6 @@ _kvm_rc_version() {
 }
 
 _kvm_find_latest() {
-  echo "Determining latest version"
-
   local platform="mono45"
   local architecture="x86"
 
@@ -64,7 +61,7 @@ _kvm_find_latest() {
     return 1
   fi
 
-  local url="https://www.myget.org/F/aspnetvnext/api/v2/GetUpdates()?packageIds=%27KRE-$platform-$architecture%27&versions=%270.0%27&includePrerelease=true&includeAllVersions=false"
+  local url="$NUGETAPIURL/GetUpdates()?packageIds=%27KRE-$platform-$architecture%27&versions=%270.0%27&includePrerelease=true&includeAllVersions=false"
   local xml=$(curl -silent -L -u aspnetreadonly:4d8a2d9c-7b80-4162-9978-47e918c9658c $url)
 
   version=$(echo $xml | sed "s/.*<[a-zA-Z]:Version>\([^<]*\).*/\1/")
@@ -73,7 +70,7 @@ _kvm_find_latest() {
 }
 
 _kvm_strip_path() {
-  echo "$1" | sed -e "s#$KVM_DIR/[^/]*$2[^:]*:##g" -e "s#:$KVM_DIR/[^/]*$2[^:]*##g" -e "s#$KVM_DIR/[^/]*$2[^:]*##g"
+  echo "$1" | sed -e "s#$USERKREPACKAGES/[^/]*$2[^:]*:##g" -e "s#:$USERKREPACKAGES/[^/]*$2[^:]*##g" -e "s#$USERKREPACKAGES/[^/]*$2[^:]*##g"
 }
 
 _kvm_prepend_path() {
@@ -90,7 +87,7 @@ _kvm_download() {
 
   local pkgName=$(echo "$kreFullName" | sed "s/\([^.]*\).*/\1/")
   local pkgVersion=$(echo "$kreFullName" | sed "s/[^.]*.\(.*\)/\1/")
-  local url="https://www.myget.org/F/aspnetvnext/api/v2/package/$pkgName/$pkgVersion"
+  local url="$NUGETAPIURL/package/$pkgName/$pkgVersion"
   local kreFile="$kreFolder/$kreFullName.nupkg"
 
   if [ -e "$kreFolder" ]; then
@@ -98,7 +95,7 @@ _kvm_download() {
     return 0
   fi
 
-  echo "Downloading" $kreFullName "from https://www.myget.org/F/aspnetvnext/api/v2/"
+  echo "Downloading $kreFullName from $NUGETAPIURL"
 
   if ! _kvm_has "curl"; then
     echo "KVM Needs curl to proceed." >&2;
@@ -107,7 +104,10 @@ _kvm_download() {
 
   mkdir -p "$kreFolder" > /dev/null 2>&1
 
-  curl -silent -L -u aspnetreadonly:4d8a2d9c-7b80-4162-9978-47e918c9658c "$url" -o "$kreFile"
+  local httpResult=$(curl -L -D - -u aspnetreadonly:4d8a2d9c-7b80-4162-9978-47e918c9658c "$url" -o "$kreFile" 2>/dev/null | grep "^HTTP/1.1" | head -n 1 | sed "s/HTTP.1.1 \([0-9]*\).*/\1/")
+
+  [[ $httpResult == "404" ]] && echo "$kreFullName was not found in repository $NUGETAPIURL" && return 1
+  [[ $httpResult != "302" ]] && echo "Http Error $httpResult fetching $kreFullName from $NUGETAPIURL" && return 1
 
   _kvm_unpack $kreFile $kreFolder
 }
@@ -131,6 +131,10 @@ _kvm_unpack() {
 
   [ -e "$kreFolder/package/" ] && rm -rf "$kreFolder/_package/"
 
+  #Set shell commands as executable
+  find "$kreFolder/bin/" -type f \
+    -exec sh -c "head -c 11 {} | grep '/bin/bash' > /dev/null"  \; -print | xargs chmod 775
+
 }
 
 # This is not really needed. Placeholder until I get clarification on the supported platforms for mono
@@ -225,8 +229,9 @@ kvm()
 
     "upgrade" )
       [ $# -ne 1 ] && kvm help && return
-
+      echo "Determining latest version"
       local version=$(_kvm_find_latest mono45 x86)
+  
       kvm install $version
       kvm alias default $version
     ;;
@@ -250,8 +255,8 @@ kvm()
         fi
 
         echo "Adding $kreBin to current PATH"
-        PATH=`_kvm_strip_path "$PATH" "/bin"`
-        PATH=`_kvm_prepend_path "$PATH" "$kreBin"`
+        PATH=$(_kvm_strip_path "$PATH" "/bin")
+        PATH=(_kvm_prepend_path "$PATH" "$kreBin")
       else
         local kreFullName="$(_kvm_requested_version_or_alias $versionOrAlias)"
         local kreFolder="$USERKREPACKAGES/$kreFullName"
@@ -310,14 +315,32 @@ kvm()
     ;;
 
     "alias" )
-      [ $# -gt 4 ] && kvm help && return
+      [ $# -gt 3 ] && kvm help && return
+
+      if [[ $# == 1 ]]; then
+        for f in $(find "$USERKREPATH/alias" -name *.alias); do echo -n "$(basename $f | sed 's/.alias//'): "; cat "$f"; done
+        echo ""
+        return;
+      fi
+
+      local name="$2"
+
+      if [[ $# == 2 ]]; then
+        [[ ! -e "$USERKREPATH/alias/$name.alias" ]] && echo "There is no alias called '$name'" && return
+        cat "$USERKREPATH/alias/$name.alias"
+        echo ""
+        return
+      fi
 
-      local alias="$2"
       local semver="$3"
+      local kreFullName="KRE-$(_kvm_requested_platform mono45)-$(_kvm_requested_architecture x86).$semver"
 
-      echo "alias $alias $semver - TBD ..."
+      echo "Setting alias '$name' to '$kreFullName'"
+      [[ ! -e "$USERKREPATH/alias/" ]] && mkdir "$USERKREPATH/alias/" > /dev/null
 
+      echo "$kreFullName" > "$USERKREPATH/alias/$name.alias"
     ;;
+
     "list" )
       # TBD, this lets our persistant impl work for now
       echo "default"

From 15f00bb7a50d48cc792b403c4cd9068fd2dd566f Mon Sep 17 00:00:00 2001
From: Graeme Christie <graeme@sx.net.au>
Date: Sun, 25 May 2014 12:22:28 +0800
Subject: [PATCH 04/26] Implemented kvm list Fixed b0rked logic in
 _kvm_requested_version_or_alias

---
 kvm.sh | 38 +++++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/kvm.sh b/kvm.sh
index 42d20a962e..1de01bc2b0 100644
--- a/kvm.sh
+++ b/kvm.sh
@@ -163,17 +163,16 @@ _kvm_requested_version_or_alias() {
   local versionOrAlias="$1"
 
   if [ -e "$USERKREPATH/alias/$versionOrAlias.alias" ]; then
-    local aliasValue=$(cat "$USERKREPATH/alias/$versionOrAlias.alias")
+    local kreFullName=$(cat "$USERKREPATH/alias/$versionOrAlias.alias")
     local pkgName=$(echo $kreFullName | sed "s/\([^.]*\).*/\1/")
-    local pkgVersion=$(echo $kreFullName | sed "s/[^.]*\(.*\)/\1/")
-    local pkgPlatform=$(echo $pgkName | sed "s/.*-\([^-]*\).*/\1/" | _kvm_requested_platform)
-    local pkgArchitecture=$(echo $pgkName | sed "s/.*-.*-\([^-]*\).*/\1/" | _kvm_requested_architecture)
+    local pkgVersion=$(echo $kreFullName | sed "s/[^.]*.\(.*\)/\1/")
+    local pkgPlatform=$(_kvm_requested_platform $(echo "$pkgName" | sed "s/KRE-\([^-]*\).*/\1/"))
+    local pkgArchitecture=$(_kvm_requested_architecture $(echo "$pkgName" | sed "s/.*-.*-\([^-]*\).*/\1/"))
   else
     local pkgVersion=$versionOrAlias
     local pkgPlatform=$(_kvm_requested_platform "mono45")
     local pkgArchitecture=$(_kvm_requested_architecture "x86")
   fi
-
   echo "KRE-$pkgPlatform-$pkgArchitecture.$pkgVersion"
 }
 
@@ -231,7 +230,7 @@ kvm()
       [ $# -ne 1 ] && kvm help && return
       echo "Determining latest version"
       local version=$(_kvm_find_latest mono45 x86)
-  
+
       kvm install $version
       kvm alias default $version
     ;;
@@ -318,7 +317,7 @@ kvm()
       [ $# -gt 3 ] && kvm help && return
 
       if [[ $# == 1 ]]; then
-        for f in $(find "$USERKREPATH/alias" -name *.alias); do echo -n "$(basename $f | sed 's/.alias//'): "; cat "$f"; done
+        for f in $(find "$USERKREPATH/alias" -name *.alias); do printf "%-20s %s\n" "$(basename $f | sed 's/.alias//')" "$(cat $f)"; done
         echo ""
         return;
       fi
@@ -342,10 +341,31 @@ kvm()
     ;;
 
     "list" )
-      # TBD, this lets our persistant impl work for now
-      echo "default"
+      [ $# -gt 2 ] && kvm help && return
+
+      local searchGlob="KRE-*"
+      if [ $# == 2 ]; then
+        local versionOrAlias=$2
+        local searchGlob=$(_kvm_requested_version_or_alias "$versionOrAlias")
+        echo $searchGlob
+      fi
+
+      for f in $(find $USERKREPACKAGES/* -name $searchGlob -type d -prune -exec basename {} \;); do
+        #TODO: Format, extract package, version arch etc
+        echo -n $f
+        if [[ $PATH == *"$USERKREPACKAGES/$f/bin"* ]]; then
+          echo " *"
+        else
+          echo ""
+        fi
+        [[ $# == 2 ]] && echo "" &&  return 0
+      done
+
       echo ""
+      [[ $# == 2 ]] && return 1 # kvm list xxx - xxx was not found
   esac
+
+  echo ""
 }
 
 kvm list default >/dev/null && kvm use default >/dev/null || true

From fe0d5b9d0d8431bd06e1e2aa00691248d178556d Mon Sep 17 00:00:00 2001
From: Graeme Christie <graeme@sx.net.au>
Date: Sun, 25 May 2014 21:56:35 +0800
Subject: [PATCH 05/26] Fixed an error when kvm list was run before kre had
 been installed renamed some variables to be more idiomatic

---
 kvm.sh | 73 +++++++++++++++++++++++++++++++---------------------------
 1 file changed, 39 insertions(+), 34 deletions(-)

diff --git a/kvm.sh b/kvm.sh
index 1de01bc2b0..650d069f0f 100644
--- a/kvm.sh
+++ b/kvm.sh
@@ -18,13 +18,15 @@ if _kvm_has "unsetopt"; then
   KVM_CD_FLAGS="-q"
 fi
 
+if [ -z "$KRE_USER_HOME" ]; then
+  eval KRE_USER_HOME=~/.kre
+fi
 
-eval USERKREPATH=~/.kre
-USERKREPACKAGES="$USERKREPATH/packages"
-MONO45=
-X86=
-X64=
-NUGETAPIURL="https://www.myget.org/F/aspnetvnext/api/v2"
+KRE_USER_PAKAGES="$KRE_USER_HOME/packages"
+KRE_MONO45=
+KRE_X86=
+KRE_X64=
+KRE_NUGET_API_URL="https://www.myget.org/F/aspnetvnext/api/v2"
 
 # Traverse up in directory tree to find containing folder
 _kvm_find_up() {
@@ -53,7 +55,7 @@ _kvm_rc_version() {
 }
 
 _kvm_find_latest() {
-  local platform="mono45"
+  local platform="KRE_MONO45"
   local architecture="x86"
 
   if ! _kvm_has "curl"; then
@@ -61,7 +63,7 @@ _kvm_find_latest() {
     return 1
   fi
 
-  local url="$NUGETAPIURL/GetUpdates()?packageIds=%27KRE-$platform-$architecture%27&versions=%270.0%27&includePrerelease=true&includeAllVersions=false"
+  local url="$KRE_NUGET_API_URL/GetUpdates()?packageIds=%27KRE-$platform-$architecture%27&versions=%270.0%27&includePrerelease=true&includeAllVersions=false"
   local xml=$(curl -silent -L -u aspnetreadonly:4d8a2d9c-7b80-4162-9978-47e918c9658c $url)
 
   version=$(echo $xml | sed "s/.*<[a-zA-Z]:Version>\([^<]*\).*/\1/")
@@ -70,7 +72,7 @@ _kvm_find_latest() {
 }
 
 _kvm_strip_path() {
-  echo "$1" | sed -e "s#$USERKREPACKAGES/[^/]*$2[^:]*:##g" -e "s#:$USERKREPACKAGES/[^/]*$2[^:]*##g" -e "s#$USERKREPACKAGES/[^/]*$2[^:]*##g"
+  echo "$1" | sed -e "s#$KRE_USER_PAKAGES/[^/]*$2[^:]*:##g" -e "s#:$KRE_USER_PAKAGES/[^/]*$2[^:]*##g" -e "s#$KRE_USER_PAKAGES/[^/]*$2[^:]*##g"
 }
 
 _kvm_prepend_path() {
@@ -87,7 +89,7 @@ _kvm_download() {
 
   local pkgName=$(echo "$kreFullName" | sed "s/\([^.]*\).*/\1/")
   local pkgVersion=$(echo "$kreFullName" | sed "s/[^.]*.\(.*\)/\1/")
-  local url="$NUGETAPIURL/package/$pkgName/$pkgVersion"
+  local url="$KRE_NUGET_API_URL/package/$pkgName/$pkgVersion"
   local kreFile="$kreFolder/$kreFullName.nupkg"
 
   if [ -e "$kreFolder" ]; then
@@ -95,7 +97,7 @@ _kvm_download() {
     return 0
   fi
 
-  echo "Downloading $kreFullName from $NUGETAPIURL"
+  echo "Downloading $kreFullName from $KRE_NUGET_API_URL"
 
   if ! _kvm_has "curl"; then
     echo "KVM Needs curl to proceed." >&2;
@@ -106,8 +108,8 @@ _kvm_download() {
 
   local httpResult=$(curl -L -D - -u aspnetreadonly:4d8a2d9c-7b80-4162-9978-47e918c9658c "$url" -o "$kreFile" 2>/dev/null | grep "^HTTP/1.1" | head -n 1 | sed "s/HTTP.1.1 \([0-9]*\).*/\1/")
 
-  [[ $httpResult == "404" ]] && echo "$kreFullName was not found in repository $NUGETAPIURL" && return 1
-  [[ $httpResult != "302" ]] && echo "Http Error $httpResult fetching $kreFullName from $NUGETAPIURL" && return 1
+  [[ $httpResult == "404" ]] && echo "$kreFullName was not found in repository $KRE_NUGET_API_URL" && return 1
+  [[ $httpResult != "302" ]] && echo "Http Error $httpResult fetching $kreFullName from $KRE_NUGET_API_URL" && return 1
 
   _kvm_unpack $kreFile $kreFolder
 }
@@ -141,7 +143,7 @@ _kvm_unpack() {
 _kvm_requested_platform() {
   local default=$1
 
-  [[ $MONO45 ]] && echo "mono45" && return
+  [[ $KRE_MONO45 ]] && echo "KRE_MONO45" && return
 
   echo $default
 }
@@ -150,11 +152,11 @@ _kvm_requested_platform() {
 _kvm_requested_architecture() {
   local default=$1
 
-  [[ $X86 && $X64 ]] && echo "This command cannot accept both -x86 and -x64" && return 1
+  [[ $KRE_X86 && $KRE_X64 ]] && echo "This command cannot accept both -x86 and -x64" && return 1
 
-  [[ $X86 ]] && echo "x86" && return
+  [[ $KRE_X86 ]] && echo "x86" && return
 
-  [[ $X64 ]] && echo "x64" && return
+  [[ $KRE_X64 ]] && echo "x64" && return
 
   echo $default
 }
@@ -162,15 +164,15 @@ _kvm_requested_architecture() {
 _kvm_requested_version_or_alias() {
   local versionOrAlias="$1"
 
-  if [ -e "$USERKREPATH/alias/$versionOrAlias.alias" ]; then
-    local kreFullName=$(cat "$USERKREPATH/alias/$versionOrAlias.alias")
+  if [ -e "$KRE_USER_HOME/alias/$versionOrAlias.alias" ]; then
+    local kreFullName=$(cat "$KRE_USER_HOME/alias/$versionOrAlias.alias")
     local pkgName=$(echo $kreFullName | sed "s/\([^.]*\).*/\1/")
     local pkgVersion=$(echo $kreFullName | sed "s/[^.]*.\(.*\)/\1/")
     local pkgPlatform=$(_kvm_requested_platform $(echo "$pkgName" | sed "s/KRE-\([^-]*\).*/\1/"))
     local pkgArchitecture=$(_kvm_requested_architecture $(echo "$pkgName" | sed "s/.*-.*-\([^-]*\).*/\1/"))
   else
     local pkgVersion=$versionOrAlias
-    local pkgPlatform=$(_kvm_requested_platform "mono45")
+    local pkgPlatform=$(_kvm_requested_platform "KRE_MONO45")
     local pkgArchitecture=$(_kvm_requested_architecture "x86")
   fi
   echo "KRE-$pkgPlatform-$pkgArchitecture.$pkgVersion"
@@ -180,7 +182,7 @@ _kvm_requested_version_or_alias() {
 _kvm_locate_kre_bin_from_full_name() {
   local kreFullName=$1
 
-  [ -e "$USERKREPACKAGES/$kreFullName/bin" ] && echo "$USERKREPACKAGES/$kreFullName/bin" && return
+  [ -e "$KRE_USER_PAKAGES/$kreFullName/bin" ] && echo "$KRE_USER_PAKAGES/$kreFullName/bin" && return
 }
 
 kvm()
@@ -229,7 +231,7 @@ kvm()
     "upgrade" )
       [ $# -ne 1 ] && kvm help && return
       echo "Determining latest version"
-      local version=$(_kvm_find_latest mono45 x86)
+      local version=$(_kvm_find_latest KRE_MONO45 x86)
 
       kvm install $version
       kvm alias default $version
@@ -242,7 +244,7 @@ kvm()
 
       if [ "$versionOrAlias" == *.nupkg ]; then
         local kreFullName=$(echo $versionOrAlias | sed "s/\(.*\)\.nupkg/\1/")
-        local kreFolder="$USERKREPACKAGES/$kreFullName"
+        local kreFolder="$KRE_USER_PAKAGES/$kreFullName"
         local kreFile="$kreFolder/$kreFullName.nupkg"
 
         if [ -e "$kreFolder" ]; then
@@ -258,7 +260,7 @@ kvm()
         PATH=(_kvm_prepend_path "$PATH" "$kreBin")
       else
         local kreFullName="$(_kvm_requested_version_or_alias $versionOrAlias)"
-        local kreFolder="$USERKREPACKAGES/$kreFullName"
+        local kreFolder="$KRE_USER_PAKAGES/$kreFullName"
         _kvm_download "$kreFullName" "$kreFolder"
         kvm use "$versionOrAlias"
       fi
@@ -286,10 +288,10 @@ kvm()
         # Strip other version from PATH
         PATH=`_kvm_strip_path "$PATH" "/bin"`
 
-        if [[ $persistent&& -e "$USERKREPATH/alias/default.alias" ]]; then
+        if [[ $persistent&& -e "$KRE_USER_HOME/alias/default.alias" ]]; then
             echo "Setting default KRE to none"
 
-            rm "$USERKREPATH/alias/default.alias"
+            rm "$KRE_USER_HOME/alias/default.alias"
         fi
         return 0
       fi
@@ -317,7 +319,7 @@ kvm()
       [ $# -gt 3 ] && kvm help && return
 
       if [[ $# == 1 ]]; then
-        for f in $(find "$USERKREPATH/alias" -name *.alias); do printf "%-20s %s\n" "$(basename $f | sed 's/.alias//')" "$(cat $f)"; done
+        for f in $(find "$KRE_USER_HOME/alias" -name *.alias); do printf "%-20s %s\n" "$(basename $f | sed 's/.alias//')" "$(cat $f)"; done
         echo ""
         return;
       fi
@@ -325,24 +327,26 @@ kvm()
       local name="$2"
 
       if [[ $# == 2 ]]; then
-        [[ ! -e "$USERKREPATH/alias/$name.alias" ]] && echo "There is no alias called '$name'" && return
-        cat "$USERKREPATH/alias/$name.alias"
+        [[ ! -e "$KRE_USER_HOME/alias/$name.alias" ]] && echo "There is no alias called '$name'" && return
+        cat "$KRE_USER_HOME/alias/$name.alias"
         echo ""
         return
       fi
 
       local semver="$3"
-      local kreFullName="KRE-$(_kvm_requested_platform mono45)-$(_kvm_requested_architecture x86).$semver"
+      local kreFullName="KRE-$(_kvm_requested_platform KRE_MONO45)-$(_kvm_requested_architecture x86).$semver"
 
       echo "Setting alias '$name' to '$kreFullName'"
-      [[ ! -e "$USERKREPATH/alias/" ]] && mkdir "$USERKREPATH/alias/" > /dev/null
+      [[ ! -e "$KRE_USER_HOME/alias/" ]] && mkdir "$KRE_USER_HOME/alias/" > /dev/null
 
-      echo "$kreFullName" > "$USERKREPATH/alias/$name.alias"
+      echo "$kreFullName" > "$KRE_USER_HOME/alias/$name.alias"
     ;;
 
     "list" )
       [ $# -gt 2 ] && kvm help && return
 
+      [ ! -d $KRE_USER_PAKAGES ] && echo "KRE is not installed." && return 1
+
       local searchGlob="KRE-*"
       if [ $# == 2 ]; then
         local versionOrAlias=$2
@@ -350,10 +354,11 @@ kvm()
         echo $searchGlob
       fi
 
-      for f in $(find $USERKREPACKAGES/* -name $searchGlob -type d -prune -exec basename {} \;); do
+
+      for f in $(find $KRE_USER_PAKAGES/* -name $searchGlob -type d -prune -exec basename {} \;); do
         #TODO: Format, extract package, version arch etc
         echo -n $f
-        if [[ $PATH == *"$USERKREPACKAGES/$f/bin"* ]]; then
+        if [[ $PATH == *"$KRE_USER_PAKAGES/$f/bin"* ]]; then
           echo " *"
         else
           echo ""

From 2ef51e052072f6ebcff9848b0b058c5838348c6d Mon Sep 17 00:00:00 2001
From: Graeme Christie <graeme@sx.net.au>
Date: Sun, 25 May 2014 21:57:34 +0800
Subject: [PATCH 06/26] Created kvmsetup.sh script to bootstrap OSX/*nix
 systems

---
 kvmsetup.sh | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 kvmsetup.sh

diff --git a/kvmsetup.sh b/kvmsetup.sh
new file mode 100644
index 0000000000..d04d2fe370
--- /dev/null
+++ b/kvmsetup.sh
@@ -0,0 +1,75 @@
+#!/bin/bash
+
+set -e
+
+_kvmsetup_has() {
+  type "$1" > /dev/null 2>&1
+  return $?
+}
+
+if [ -z "$KRE_USER_HOME" ]; then
+  eval KRE_USER_HOME=~/.kre
+fi
+
+if ! _kvmsetup_has "curl"; then
+  echo "kvmsetup requires curl to be installed"
+  return 1
+fi
+
+if [ -z "$KVM_SOURCE" ]; then
+  KVM_SOURCE="https://raw.githubusercontent.com/graemechristie/Home/KvmShellImplementation/kvm.sh"
+fi
+
+# Downloading to $KVM_DIR
+mkdir -p "$KRE_USER_HOME/kvm"
+if [ -s "$KRE_USER_HOME/kvm/kvm.sh" ]; then
+  echo "=> kvm is already installed in $KRE_USER_HOME/kvm, trying to update"
+else
+  echo "=> Downloading kvm as script to '$KRE_USER_HOME/kvm'"
+fi
+
+curl -s "$KVM_SOURCE" -o "$KRE_USER_HOME/kvm/kvm.sh" || {
+  echo >&2 "Failed to download '$KVM_SOURCE'.."
+  return 1
+}
+
+
+echo
+
+# Detect profile file if not specified as environment variable (eg: PROFILE=~/.myprofile).
+if [ -z "$PROFILE" ]; then
+  if [ -f "$HOME/.bash_profile" ]; then
+    PROFILE="$HOME/.bash_profile"
+  elif [ -f "$HOME/.zshrc" ]; then
+    PROFILE="$HOME/.zshrc"
+  elif [ -f "$HOME/.profile" ]; then
+    PROFILE="$HOME/.profile"
+  fi
+fi
+
+SOURCE_STR="[ -s \"$KRE_USER_HOME/kvm/kvm.sh\" ] && . \"$KRE_USER_HOME/kvm/kvm.sh\"  # This loads kvm"
+
+if [ -z "$PROFILE" ] || [ ! -f "$PROFILE" ] ; then
+  if [ -z $PROFILE ]; then
+    echo "=> Profile not found. Tried ~/.bash_profile ~/.zshrc and ~/.profile."
+    echo "=> Create one of them and run this script again"
+  else
+    echo "=> Profile $PROFILE not found"
+    echo "=> Create it (touch $PROFILE) and run this script again"
+  fi
+  echo "   OR"
+  echo "=> Append the following line to the correct file yourself:"
+  echo
+  echo "   $SOURCE_STR"
+  echo
+else
+  if ! grep -qc 'kvm.sh' $PROFILE; then
+    echo "=> Appending source string to $PROFILE"
+    echo "" >> "$PROFILE"
+    echo $SOURCE_STR >> "$PROFILE"
+  else
+    echo "=> Source string already in $PROFILE"
+  fi
+fi
+
+echo "=> Close and reopen your terminal to start using kvm"

From bb515661579bf1319d4045bc2a889fbbaee12dcb Mon Sep 17 00:00:00 2001
From: Graeme Christie <graeme@sx.net.au>
Date: Sun, 25 May 2014 22:10:23 +0800
Subject: [PATCH 07/26] Minor update of command output

---
 kvmsetup.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/kvmsetup.sh b/kvmsetup.sh
index d04d2fe370..5ed2c2e367 100644
--- a/kvmsetup.sh
+++ b/kvmsetup.sh
@@ -30,7 +30,7 @@ fi
 
 curl -s "$KVM_SOURCE" -o "$KRE_USER_HOME/kvm/kvm.sh" || {
   echo >&2 "Failed to download '$KVM_SOURCE'.."
-  return 1
+  return 1`
 }
 
 
@@ -47,7 +47,7 @@ if [ -z "$PROFILE" ]; then
   fi
 fi
 
-SOURCE_STR="[ -s \"$KRE_USER_HOME/kvm/kvm.sh\" ] && . \"$KRE_USER_HOME/kvm/kvm.sh\"  # This loads kvm"
+SOURCE_STR="[ -s \"$KRE_USER_HOME/kvm/kvm.sh\" ] && . \"$KRE_USER_HOME/kvm/kvm.sh\"  
 
 if [ -z "$PROFILE" ] || [ ! -f "$PROFILE" ] ; then
   if [ -z $PROFILE ]; then
@@ -73,3 +73,4 @@ else
 fi
 
 echo "=> Close and reopen your terminal to start using kvm"
+echo "=> then type 'kvm upgrade' to install the latest version of the K Runtime Environment"

From 6e72ddee86a69e6a71ef2751912b2a3c5b661f05 Mon Sep 17 00:00:00 2001
From: Graeme Christie <graeme@sx.net.au>
Date: Sun, 25 May 2014 22:17:47 +0800
Subject: [PATCH 08/26] Fixed missing quote

---
 kvmsetup.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kvmsetup.sh b/kvmsetup.sh
index 5ed2c2e367..0f2c7d860f 100644
--- a/kvmsetup.sh
+++ b/kvmsetup.sh
@@ -30,7 +30,7 @@ fi
 
 curl -s "$KVM_SOURCE" -o "$KRE_USER_HOME/kvm/kvm.sh" || {
   echo >&2 "Failed to download '$KVM_SOURCE'.."
-  return 1`
+  return 1
 }
 
 
@@ -47,7 +47,7 @@ if [ -z "$PROFILE" ]; then
   fi
 fi
 
-SOURCE_STR="[ -s \"$KRE_USER_HOME/kvm/kvm.sh\" ] && . \"$KRE_USER_HOME/kvm/kvm.sh\"  
+SOURCE_STR="[ -s \"$KRE_USER_HOME/kvm/kvm.sh\" ] && . \"$KRE_USER_HOME/kvm/kvm.sh\"# this loads kvm"
 
 if [ -z "$PROFILE" ] || [ ! -f "$PROFILE" ] ; then
   if [ -z $PROFILE ]; then
@@ -73,4 +73,4 @@ else
 fi
 
 echo "=> Close and reopen your terminal to start using kvm"
-echo "=> then type 'kvm upgrade' to install the latest version of the K Runtime Environment"
+echo "=> then type \"kvm upgrade\" to install the latest version of the K Runtime Environment"

From e14210b2a159a29d8734ab6587470f65d73dc203 Mon Sep 17 00:00:00 2001
From: Graeme Christie <graeme@sx.net.au>
Date: Sun, 25 May 2014 22:38:59 +0800
Subject: [PATCH 09/26] Fixed issue where mono45 platform string had been
 replaced with KRE_MONO45

---
 kvm.sh | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/kvm.sh b/kvm.sh
index 650d069f0f..acf6f986b1 100644
--- a/kvm.sh
+++ b/kvm.sh
@@ -22,7 +22,7 @@ if [ -z "$KRE_USER_HOME" ]; then
   eval KRE_USER_HOME=~/.kre
 fi
 
-KRE_USER_PAKAGES="$KRE_USER_HOME/packages"
+KRE_USER_PACKAGES="$KRE_USER_HOME/packages"
 KRE_MONO45=
 KRE_X86=
 KRE_X64=
@@ -55,7 +55,7 @@ _kvm_rc_version() {
 }
 
 _kvm_find_latest() {
-  local platform="KRE_MONO45"
+  local platform="mono45"
   local architecture="x86"
 
   if ! _kvm_has "curl"; then
@@ -65,14 +65,13 @@ _kvm_find_latest() {
 
   local url="$KRE_NUGET_API_URL/GetUpdates()?packageIds=%27KRE-$platform-$architecture%27&versions=%270.0%27&includePrerelease=true&includeAllVersions=false"
   local xml=$(curl -silent -L -u aspnetreadonly:4d8a2d9c-7b80-4162-9978-47e918c9658c $url)
-
   version=$(echo $xml | sed "s/.*<[a-zA-Z]:Version>\([^<]*\).*/\1/")
-
+  [[ $xml == $version ]] && return 1
   echo $version
 }
 
 _kvm_strip_path() {
-  echo "$1" | sed -e "s#$KRE_USER_PAKAGES/[^/]*$2[^:]*:##g" -e "s#:$KRE_USER_PAKAGES/[^/]*$2[^:]*##g" -e "s#$KRE_USER_PAKAGES/[^/]*$2[^:]*##g"
+  echo "$1" | sed -e "s#$KRE_USER_PACKAGES/[^/]*$2[^:]*:##g" -e "s#:$KRE_USER_PACKAGES/[^/]*$2[^:]*##g" -e "s#$KRE_USER_PACKAGES/[^/]*$2[^:]*##g"
 }
 
 _kvm_prepend_path() {
@@ -143,7 +142,7 @@ _kvm_unpack() {
 _kvm_requested_platform() {
   local default=$1
 
-  [[ $KRE_MONO45 ]] && echo "KRE_MONO45" && return
+  [[ $KRE_MONO45 ]] && echo "mono45" && return
 
   echo $default
 }
@@ -172,7 +171,7 @@ _kvm_requested_version_or_alias() {
     local pkgArchitecture=$(_kvm_requested_architecture $(echo "$pkgName" | sed "s/.*-.*-\([^-]*\).*/\1/"))
   else
     local pkgVersion=$versionOrAlias
-    local pkgPlatform=$(_kvm_requested_platform "KRE_MONO45")
+    local pkgPlatform=$(_kvm_requested_platform "mono45")
     local pkgArchitecture=$(_kvm_requested_architecture "x86")
   fi
   echo "KRE-$pkgPlatform-$pkgArchitecture.$pkgVersion"
@@ -182,7 +181,7 @@ _kvm_requested_version_or_alias() {
 _kvm_locate_kre_bin_from_full_name() {
   local kreFullName=$1
 
-  [ -e "$KRE_USER_PAKAGES/$kreFullName/bin" ] && echo "$KRE_USER_PAKAGES/$kreFullName/bin" && return
+  [ -e "$KRE_USER_PACKAGES/$kreFullName/bin" ] && echo "$KRE_USER_PACKAGES/$kreFullName/bin" && return
 }
 
 kvm()
@@ -231,8 +230,8 @@ kvm()
     "upgrade" )
       [ $# -ne 1 ] && kvm help && return
       echo "Determining latest version"
-      local version=$(_kvm_find_latest KRE_MONO45 x86)
-
+      local version=$(_kvm_find_latest mono45 x86)
+      echo $version
       kvm install $version
       kvm alias default $version
     ;;
@@ -244,7 +243,7 @@ kvm()
 
       if [ "$versionOrAlias" == *.nupkg ]; then
         local kreFullName=$(echo $versionOrAlias | sed "s/\(.*\)\.nupkg/\1/")
-        local kreFolder="$KRE_USER_PAKAGES/$kreFullName"
+        local kreFolder="$KRE_USER_PACKAGES/$kreFullName"
         local kreFile="$kreFolder/$kreFullName.nupkg"
 
         if [ -e "$kreFolder" ]; then
@@ -260,7 +259,7 @@ kvm()
         PATH=(_kvm_prepend_path "$PATH" "$kreBin")
       else
         local kreFullName="$(_kvm_requested_version_or_alias $versionOrAlias)"
-        local kreFolder="$KRE_USER_PAKAGES/$kreFullName"
+        local kreFolder="$KRE_USER_PACKAGES/$kreFullName"
         _kvm_download "$kreFullName" "$kreFolder"
         kvm use "$versionOrAlias"
       fi
@@ -334,7 +333,7 @@ kvm()
       fi
 
       local semver="$3"
-      local kreFullName="KRE-$(_kvm_requested_platform KRE_MONO45)-$(_kvm_requested_architecture x86).$semver"
+      local kreFullName="KRE-$(_kvm_requested_platform mono45)-$(_kvm_requested_architecture x86).$semver"
 
       echo "Setting alias '$name' to '$kreFullName'"
       [[ ! -e "$KRE_USER_HOME/alias/" ]] && mkdir "$KRE_USER_HOME/alias/" > /dev/null
@@ -345,7 +344,7 @@ kvm()
     "list" )
       [ $# -gt 2 ] && kvm help && return
 
-      [ ! -d $KRE_USER_PAKAGES ] && echo "KRE is not installed." && return 1
+      [ ! -d $KRE_USER_PACKAGES ] && echo "KRE is not installed." && return 1
 
       local searchGlob="KRE-*"
       if [ $# == 2 ]; then
@@ -355,10 +354,10 @@ kvm()
       fi
 
 
-      for f in $(find $KRE_USER_PAKAGES/* -name $searchGlob -type d -prune -exec basename {} \;); do
+      for f in $(find $KRE_USER_PACKAGES/* -name $searchGlob -type d -prune -exec basename {} \;); do
         #TODO: Format, extract package, version arch etc
         echo -n $f
-        if [[ $PATH == *"$KRE_USER_PAKAGES/$f/bin"* ]]; then
+        if [[ $PATH == *"$KRE_USER_PACKAGES/$f/bin"* ]]; then
           echo " *"
         else
           echo ""
@@ -369,8 +368,6 @@ kvm()
       echo ""
       [[ $# == 2 ]] && return 1 # kvm list xxx - xxx was not found
   esac
-
-  echo ""
 }
 
 kvm list default >/dev/null && kvm use default >/dev/null || true

From d87f800f41afd8c3ca17ecd9031ae18f8469c386 Mon Sep 17 00:00:00 2001
From: Graeme Christie <graeme@sx.net.au>
Date: Sun, 25 May 2014 22:40:23 +0800
Subject: [PATCH 10/26] Removed hint to run kvm upgrade from output as we can
 include that in the curl | sh command

---
 kvmsetup.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kvmsetup.sh b/kvmsetup.sh
index 0f2c7d860f..6867ee5ba3 100644
--- a/kvmsetup.sh
+++ b/kvmsetup.sh
@@ -73,4 +73,3 @@ else
 fi
 
 echo "=> Close and reopen your terminal to start using kvm"
-echo "=> then type \"kvm upgrade\" to install the latest version of the K Runtime Environment"

From 601e875dddca8c860610b2d1198fec7ab3c8ce8d Mon Sep 17 00:00:00 2001
From: Graeme Christie <graeme@sx.net.au>
Date: Sun, 25 May 2014 23:34:24 +0800
Subject: [PATCH 11/26] Fixed the help text from kvm use -p to more accurately
 reflect how defaults are set

---
 kvm.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kvm.sh b/kvm.sh
index acf6f986b1..c1ecd56923 100644
--- a/kvm.sh
+++ b/kvm.sh
@@ -210,7 +210,7 @@ kvm()
       echo "kvm use <semver>|<alias>|none [-p -persistent]"
       echo "<semver>|<alias>  add KRE bin to path of current command line   "
       echo "none              remove KRE bin from path of current command line"
-      echo "-p -persistent   persist selected version to .kvmrc"
+      echo "-p -persistent   set selected version as default"
       echo ""
       echo "kvm list"
       echo "list KRE versions installed "

From c4b07280b6c977d1f560940c7fb54f84cb20e3ac Mon Sep 17 00:00:00 2001
From: Graeme Christie <graeme@sx.net.au>
Date: Mon, 26 May 2014 00:18:09 +0800
Subject: [PATCH 12/26] Added space before # comment in bash profile command

---
 kvmsetup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kvmsetup.sh b/kvmsetup.sh
index 6867ee5ba3..5321375ea3 100644
--- a/kvmsetup.sh
+++ b/kvmsetup.sh
@@ -47,7 +47,7 @@ if [ -z "$PROFILE" ]; then
   fi
 fi
 
-SOURCE_STR="[ -s \"$KRE_USER_HOME/kvm/kvm.sh\" ] && . \"$KRE_USER_HOME/kvm/kvm.sh\"# this loads kvm"
+SOURCE_STR="[ -s \"$KRE_USER_HOME/kvm/kvm.sh\" ] && . \"$KRE_USER_HOME/kvm/kvm.sh\" # this loads kvm"
 
 if [ -z "$PROFILE" ] || [ ! -f "$PROFILE" ] ; then
   if [ -z $PROFILE ]; then

From f2c4a0d39f8b1987ee204367f09c5d428935ef12 Mon Sep 17 00:00:00 2001
From: Graeme Christie <graeme@sx.net.au>
Date: Mon, 26 May 2014 00:46:11 +0800
Subject: [PATCH 13/26] Added .bashrc to list of profile files checked

---
 kvmsetup.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kvmsetup.sh b/kvmsetup.sh
index 5321375ea3..82d6f6a3bd 100644
--- a/kvmsetup.sh
+++ b/kvmsetup.sh
@@ -40,6 +40,8 @@ echo
 if [ -z "$PROFILE" ]; then
   if [ -f "$HOME/.bash_profile" ]; then
     PROFILE="$HOME/.bash_profile"
+  if [ -f "$HOME/.bashrc" ]; then
+    PROFILE="$HOME/.bashrc"
   elif [ -f "$HOME/.zshrc" ]; then
     PROFILE="$HOME/.zshrc"
   elif [ -f "$HOME/.profile" ]; then

From 6447439179b2f7d9410bba4cd81489c65e1e56e8 Mon Sep 17 00:00:00 2001
From: Graeme Christie <graeme@sx.net.au>
Date: Mon, 26 May 2014 00:48:36 +0800
Subject: [PATCH 14/26] Fixed typo

---
 kvmsetup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kvmsetup.sh b/kvmsetup.sh
index 82d6f6a3bd..9de840de01 100644
--- a/kvmsetup.sh
+++ b/kvmsetup.sh
@@ -40,7 +40,7 @@ echo
 if [ -z "$PROFILE" ]; then
   if [ -f "$HOME/.bash_profile" ]; then
     PROFILE="$HOME/.bash_profile"
-  if [ -f "$HOME/.bashrc" ]; then
+  elif [ -f "$HOME/.bashrc" ]; then
     PROFILE="$HOME/.bashrc"
   elif [ -f "$HOME/.zshrc" ]; then
     PROFILE="$HOME/.zshrc"

From 53911491191ff73a06905e95604e7e1491216c8f Mon Sep 17 00:00:00 2001
From: Graeme Christie <graeme@sx.net.au>
Date: Mon, 26 May 2014 16:45:41 +0800
Subject: [PATCH 15/26] Updated Readme.md with quick start info for OSX/Linux
 Replaced the 'close and open your shell' message with on to just 'source
 kvm.sh'

---
 README.md   | 29 +++++++++++++++++++++--------
 kvmsetup.sh |  2 +-
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index c58af470bd..114faa9c82 100644
--- a/README.md
+++ b/README.md
@@ -11,25 +11,35 @@ The samples provided are designed to show some of the features of the new framew
 
 These are the current minimum requirements, they do not necesarilly represent our RTM minimum.
 
-* Windows 7 or greater, though Core CLR will only work on Windows 8 today. If using Core CLR you will need to be on Windows 8 or above. At RTM the whole stack will support Windows 7+ and Windows Server 2008 R2+.
-* .NET 4.5.1 for hosting in IIS
-* Powershell 4. KVM is a Powershell script that makes use of types that older verisons of Powershell cannot load
+### Windows
+ * Windows 7 or greater, though Core CLR will only work on Windows 8 today. If using Core CLR you will need to be on Windows 8 or above. At RTM the whole stack will support Windows 7+ and Windows Server 2008 R2+.
+ * .NET 4.5.1 for hosting in IIS
+ * Powershell 4. KVM is a Powershell script that makes use of types that older verisons of Powershell cannot load
+
+
+### OSX/Linux
+ * Mono > 3.4.0 - Currently this means compiling mono from source from https://github.com/mono/mono
+  * On Linux, you may need to run `mozroots --import` after installing mono
+ * bash/zsh and curl
 
- 
 #Getting Started
 
 The first thing we need to do is setup the tools required to build and run an application. We will start out by getting the [K Version Manager (KVM)](https://github.com/aspnet/Home/wiki/version-manager)
 
 * Clone the repository
-* On the command line execute ```kvmsetup.cmd``` 
+* On the command line execute
+ * ```kvmsetup.cmd``` on Windows or
+ * ```sh kvmsetup.sh && source ~/.kre/kvm/kvm.sh``` on OSX/Linux
 * This command will setup your environment, getting it ready to install a version of the runtime. It adds kvm to your path and puts it in your user profile.
 * Execute ```kvm install 0.1-alpha-build-0421```. This command will download the named version of the KRE and put it on your user profile ready to use. You can get the latest version by running ```kvm upgrade``` but 0421 was the last version explicitly tested. see the [KVM page](https://github.com/aspnet/Home/wiki/version-manager) for more information on KVM.
 * Navigate to samples\ConsoleApp
 * Run ```kpm restore```. This downloads the System.Console package so the app can do Console.WriteLine
-* Run ```K run```
+* Run ```k run```
 * You should see a message saying "Hello World"
-* Type ```SET KRE_TRACE=1```
-* Run ```K run```
+* Type
+ * ```SET KRE_TRACE=1``` on Windows or
+ * ```export KRE_TRACE=1``` on OSX/Linux
+* Run ```k run```
 * You should now see compiler output as well as the "Hello World" message
 
 ```
@@ -84,6 +94,7 @@ If you can do all of the above then everything should be working. You can try ou
 
 #Switching to Core CLR
 
+
 By default when running the applications you are running against Desktop CLR (4.5), you can change that using the KVM command.
 
 1. Run ```kvm install 0.1-alpha-build-0421 -svrc50``` This command gets the latest Core CLR version of the k runtime and sets it as your default. The -svrc50 switch tells it to use Core CLR, you can use -svr50 to target desktop again.
@@ -93,6 +104,8 @@ By default when running the applications you are running against Desktop CLR (4.
 
 **NOTE: There are going to be parts of the stack that work on Desktop but do not work on Core CLR. This set should get smaller and smaller as time goes on, but it is entirely likely as you use Core CLR you will hit errors that can't be worked around as the Core CLR surface area just does not exist yet.**
 
+**NOTE: There is no Core CLR currently on OSX/Linux. There is only a single platform (mono45) and a single architecture (x86).**
+
 #Core CLR Packages
 
 Currently the BCL is split into some fairly fine grained packages, which was one of the goals of this effort. However, the packages that exist today do not necessarily represent the list of packages that we will end up with. We are still experimenting with what makes sense to be a package and what the experience should be.
diff --git a/kvmsetup.sh b/kvmsetup.sh
index 9de840de01..b10e432d75 100644
--- a/kvmsetup.sh
+++ b/kvmsetup.sh
@@ -74,4 +74,4 @@ else
   fi
 fi
 
-echo "=> Close and reopen your terminal to start using kvm"
+echo "=> Type 'source $KRE_USER_HOME/kvm/kvm.sh' to start using kvm"

From 8a75984d4435a4630fd742c3d2d0313ef30080d6 Mon Sep 17 00:00:00 2001
From: Graeme Christie <graeme@sx.net.au>
Date: Mon, 26 May 2014 17:08:49 +0800
Subject: [PATCH 16/26] Fixed syntax of mozroots command and some other small
 layout fixes

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 114faa9c82..c01ae44338 100644
--- a/README.md
+++ b/README.md
@@ -19,8 +19,8 @@ These are the current minimum requirements, they do not necesarilly represent ou
 
 ### OSX/Linux
  * Mono > 3.4.0 - Currently this means compiling mono from source from https://github.com/mono/mono
-  * On Linux, you may need to run `mozroots --import` after installing mono
- * bash/zsh and curl
+ * On Linux, you may need to run `mozroots --import --sync` after installing mono
+ * bash or zsh and curl
 
 #Getting Started
 

From feadd7c96b6d83f55582fdd5df4cfe4d8c43c09f Mon Sep 17 00:00:00 2001
From: Graeme Christie <graeme@sx.net.au>
Date: Mon, 26 May 2014 18:15:49 +0800
Subject: [PATCH 17/26] Changed >3.4.0 mono version to >=3.4.1 to avoid
 confusion

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c01ae44338..11a62239e2 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ These are the current minimum requirements, they do not necesarilly represent ou
 
 
 ### OSX/Linux
- * Mono > 3.4.0 - Currently this means compiling mono from source from https://github.com/mono/mono
+ * Mono >= 3.4.1 - Currently this means compiling Mono from source from https://github.com/mono/mono
  * On Linux, you may need to run `mozroots --import --sync` after installing mono
  * bash or zsh and curl
 

From 0ac3d020f4309096d18d951eb4e97c9e8a5a38a7 Mon Sep 17 00:00:00 2001
From: Graeme Christie <graeme@sx.net.au>
Date: Wed, 28 May 2014 00:47:17 +0800
Subject: [PATCH 18/26] Fixed kvm.sh to work on zsh

---
 kvm.sh | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/kvm.sh b/kvm.sh
index c1ecd56923..cf0c567789 100644
--- a/kvm.sh
+++ b/kvm.sh
@@ -64,8 +64,9 @@ _kvm_find_latest() {
   fi
 
   local url="$KRE_NUGET_API_URL/GetUpdates()?packageIds=%27KRE-$platform-$architecture%27&versions=%270.0%27&includePrerelease=true&includeAllVersions=false"
-  local xml=$(curl -silent -L -u aspnetreadonly:4d8a2d9c-7b80-4162-9978-47e918c9658c $url)
-  version=$(echo $xml | sed "s/.*<[a-zA-Z]:Version>\([^<]*\).*/\1/")
+  local cmd=
+  local xml="$(curl $url 2>/dev/null)"
+  version="$(echo $xml | sed 's/.*<[a-zA-Z]:Version>\([^<]*\).*/\1/')"
   [[ $xml == $version ]] && return 1
   echo $version
 }
@@ -142,7 +143,7 @@ _kvm_unpack() {
 _kvm_requested_platform() {
   local default=$1
 
-  [[ $KRE_MONO45 ]] && echo "mono45" && return
+  [[ -z $KRE_MONO45 ]] && echo "mono45" && return
 
   echo $default
 }
@@ -151,11 +152,11 @@ _kvm_requested_platform() {
 _kvm_requested_architecture() {
   local default=$1
 
-  [[ $KRE_X86 && $KRE_X64 ]] && echo "This command cannot accept both -x86 and -x64" && return 1
+  [[ -n $KRE_X86 && -n $KRE_X64 ]] && echo "This command cannot accept both -x86 and -x64" && return 1
 
-  [[ $KRE_X86 ]] && echo "x86" && return
+  [[ -z $KRE_X86 ]] && echo "x86" && return
 
-  [[ $KRE_X64 ]] && echo "x64" && return
+  [[ -z $KRE_X64 ]] && echo "x64" && return
 
   echo $default
 }
@@ -287,7 +288,7 @@ kvm()
         # Strip other version from PATH
         PATH=`_kvm_strip_path "$PATH" "/bin"`
 
-        if [[ $persistent&& -e "$KRE_USER_HOME/alias/default.alias" ]]; then
+        if [[ -n $persistent && -e "$KRE_USER_HOME/alias/default.alias" ]]; then
             echo "Setting default KRE to none"
 
             rm "$KRE_USER_HOME/alias/default.alias"
@@ -298,7 +299,7 @@ kvm()
       local kreFullName=$(_kvm_requested_version_or_alias "$versionOrAlias")
       local kreBin=$(_kvm_locate_kre_bin_from_full_name "$kreFullName")
 
-      if [[ ! $kreBin ]]; then
+      if [[ -z $kreBin ]]; then
         echo "Cannot find $kreFullName, do you need to run 'kvm install $versionOrAlias'?"
         return 1
       fi
@@ -308,14 +309,14 @@ kvm()
       PATH=`_kvm_strip_path "$PATH" "/bin"`
       PATH=`_kvm_prepend_path "$PATH" "$kreBin"`
 
-      if [[ $persistent ]]; then
+      if [[ -n $persistent ]]; then
           echo "Setting  $kreBin as default KRE"
           kvm alias default "$versionOrAlias"
       fi
     ;;
 
     "alias" )
-      [ $# -gt 3 ] && kvm help && return
+      [[ $# -gt 3 ]] && kvm help && return
 
       if [[ $# == 1 ]]; then
         for f in $(find "$KRE_USER_HOME/alias" -name *.alias); do printf "%-20s %s\n" "$(basename $f | sed 's/.alias//')" "$(cat $f)"; done
@@ -342,9 +343,9 @@ kvm()
     ;;
 
     "list" )
-      [ $# -gt 2 ] && kvm help && return
+      [[ $# -gt 2 ]] && kvm help && return
 
-      [ ! -d $KRE_USER_PACKAGES ] && echo "KRE is not installed." && return 1
+      [[ ! -d $KRE_USER_PACKAGES ]] && echo "KRE is not installed." && return 1
 
       local searchGlob="KRE-*"
       if [ $# == 2 ]; then
@@ -353,7 +354,6 @@ kvm()
         echo $searchGlob
       fi
 
-
       for f in $(find $KRE_USER_PACKAGES/* -name $searchGlob -type d -prune -exec basename {} \;); do
         #TODO: Format, extract package, version arch etc
         echo -n $f
@@ -367,6 +367,11 @@ kvm()
 
       echo ""
       [[ $# == 2 ]] && return 1 # kvm list xxx - xxx was not found
+      ;;
+
+    *)
+      echo "Unknown command $1"
+      return 1
   esac
 }
 

From bac5f06a4cb9c17ea4e775c6aa0f64fcd43c7e4d Mon Sep 17 00:00:00 2001
From: Graeme Christie <graeme@sx.net.au>
Date: Wed, 28 May 2014 00:55:04 +0800
Subject: [PATCH 19/26] Added validation of version to kvm alias command

---
 kvm.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kvm.sh b/kvm.sh
index cf0c567789..72ba9b951c 100644
--- a/kvm.sh
+++ b/kvm.sh
@@ -336,6 +336,8 @@ kvm()
       local semver="$3"
       local kreFullName="KRE-$(_kvm_requested_platform mono45)-$(_kvm_requested_architecture x86).$semver"
 
+      [[ ! -d "$KRE_USER_PACKAGES/$kreFullName" ]] && echo "$semver is not an installed KRE version." && return 1
+
       echo "Setting alias '$name' to '$kreFullName'"
       [[ ! -e "$KRE_USER_HOME/alias/" ]] && mkdir "$KRE_USER_HOME/alias/" > /dev/null
 

From 54171dd2213161da66a629b400c674de2af65486 Mon Sep 17 00:00:00 2001
From: Graeme Christie <graeme@sx.net.au>
Date: Wed, 28 May 2014 01:12:14 +0800
Subject: [PATCH 20/26] Updated kvmsetup to add kvm.sh to both bash and zsh
 profiles if found

---
 kvmsetup.sh | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/kvmsetup.sh b/kvmsetup.sh
index b10e432d75..55c30c993a 100644
--- a/kvmsetup.sh
+++ b/kvmsetup.sh
@@ -7,6 +7,18 @@ _kvmsetup_has() {
   return $?
 }
 
+_kvmsetup_update_profile() {
+  local profile="$1"
+  local sourceString="$2"
+  if ! grep -qc 'kvm.sh' $profile; then
+    echo "=> Appending source string to $profile"
+    echo "" >> "$profile"
+    echo $sourceString >> "$profile"
+  else
+    echo "=> Source string already in $profile"
+  fi
+}
+
 if [ -z "$KRE_USER_HOME" ]; then
   eval KRE_USER_HOME=~/.kre
 fi
@@ -33,7 +45,6 @@ curl -s "$KVM_SOURCE" -o "$KRE_USER_HOME/kvm/kvm.sh" || {
   return 1
 }
 
-
 echo
 
 # Detect profile file if not specified as environment variable (eg: PROFILE=~/.myprofile).
@@ -42,22 +53,29 @@ if [ -z "$PROFILE" ]; then
     PROFILE="$HOME/.bash_profile"
   elif [ -f "$HOME/.bashrc" ]; then
     PROFILE="$HOME/.bashrc"
-  elif [ -f "$HOME/.zshrc" ]; then
-    PROFILE="$HOME/.zshrc"
   elif [ -f "$HOME/.profile" ]; then
     PROFILE="$HOME/.profile"
   fi
 fi
 
+if [ -f "$HOME/.zshrc" ]; then
+  ZPROFILE="$HOME/.zshrc"
+fi
+
+echo ">>$ZPROFILE"
+
 SOURCE_STR="[ -s \"$KRE_USER_HOME/kvm/kvm.sh\" ] && . \"$KRE_USER_HOME/kvm/kvm.sh\" # this loads kvm"
 
-if [ -z "$PROFILE" ] || [ ! -f "$PROFILE" ] ; then
+if [[ -z "$PROFILE" && -z $ZPROFILE ]] || [[ ! -f "$PROFILE" && ! -f "$ZPROFILE" ]] ; then
   if [ -z $PROFILE ]; then
     echo "=> Profile not found. Tried ~/.bash_profile ~/.zshrc and ~/.profile."
     echo "=> Create one of them and run this script again"
-  else
+  elif [[ ! -f $PROFILE ]]; then
     echo "=> Profile $PROFILE not found"
     echo "=> Create it (touch $PROFILE) and run this script again"
+  else
+    echo "=> Profile $ZPROFILE not found"
+    echo "=> Create it (touch $ZPROFILE) and run this script again"
   fi
   echo "   OR"
   echo "=> Append the following line to the correct file yourself:"
@@ -65,13 +83,8 @@ if [ -z "$PROFILE" ] || [ ! -f "$PROFILE" ] ; then
   echo "   $SOURCE_STR"
   echo
 else
-  if ! grep -qc 'kvm.sh' $PROFILE; then
-    echo "=> Appending source string to $PROFILE"
-    echo "" >> "$PROFILE"
-    echo $SOURCE_STR >> "$PROFILE"
-  else
-    echo "=> Source string already in $PROFILE"
-  fi
+  [[ -n $PROFILE ]] && _kvmsetup_update_profile "$PROFILE" "$SOURCE_STR"
+  [[ -n $ZPROFILE ]] && _kvmsetup_update_profile "$ZPROFILE" "$SOURCE_STR"
 fi
 
 echo "=> Type 'source $KRE_USER_HOME/kvm/kvm.sh' to start using kvm"

From 165d69a1e7e04284955cda3a2a525802e13950ee Mon Sep 17 00:00:00 2001
From: Graeme Christie <graeme@sx.net.au>
Date: Wed, 28 May 2014 01:23:16 +0800
Subject: [PATCH 21/26] Quoted test arguments for compatibility with zsh

---
 kvmsetup.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/kvmsetup.sh b/kvmsetup.sh
index 55c30c993a..2a95a22a34 100644
--- a/kvmsetup.sh
+++ b/kvmsetup.sh
@@ -66,11 +66,11 @@ echo ">>$ZPROFILE"
 
 SOURCE_STR="[ -s \"$KRE_USER_HOME/kvm/kvm.sh\" ] && . \"$KRE_USER_HOME/kvm/kvm.sh\" # this loads kvm"
 
-if [[ -z "$PROFILE" && -z $ZPROFILE ]] || [[ ! -f "$PROFILE" && ! -f "$ZPROFILE" ]] ; then
-  if [ -z $PROFILE ]; then
+if [[ -z "$PROFILE" && -z "$ZPROFILE" ]] || [[ ! -f "$PROFILE" && ! -f "$ZPROFILE" ]] ; then
+  if [ -z "$PROFILE" ]; then
     echo "=> Profile not found. Tried ~/.bash_profile ~/.zshrc and ~/.profile."
     echo "=> Create one of them and run this script again"
-  elif [[ ! -f $PROFILE ]]; then
+  elif [[ ! -f "$PROFILE" ]]; then
     echo "=> Profile $PROFILE not found"
     echo "=> Create it (touch $PROFILE) and run this script again"
   else
@@ -83,8 +83,8 @@ if [[ -z "$PROFILE" && -z $ZPROFILE ]] || [[ ! -f "$PROFILE" && ! -f "$ZPROFILE"
   echo "   $SOURCE_STR"
   echo
 else
-  [[ -n $PROFILE ]] && _kvmsetup_update_profile "$PROFILE" "$SOURCE_STR"
-  [[ -n $ZPROFILE ]] && _kvmsetup_update_profile "$ZPROFILE" "$SOURCE_STR"
+  [[ -n "$PROFILE" ]] && _kvmsetup_update_profile "$PROFILE" "$SOURCE_STR"
+  [[ -n "$ZPROFILE" ]] && _kvmsetup_update_profile "$ZPROFILE" "$SOURCE_STR"
 fi
 
 echo "=> Type 'source $KRE_USER_HOME/kvm/kvm.sh' to start using kvm"

From 765c431f0efc924dec282b16c2743f0c04fc0fba Mon Sep 17 00:00:00 2001
From: Graeme Christie <graeme@sx.net.au>
Date: Wed, 28 May 2014 01:28:04 +0800
Subject: [PATCH 22/26] Changed all test command in kvmsetup.sh to use single
 brackets

---
 kvmsetup.sh | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/kvmsetup.sh b/kvmsetup.sh
index 2a95a22a34..ecd48128c1 100644
--- a/kvmsetup.sh
+++ b/kvmsetup.sh
@@ -62,15 +62,13 @@ if [ -f "$HOME/.zshrc" ]; then
   ZPROFILE="$HOME/.zshrc"
 fi
 
-echo ">>$ZPROFILE"
-
 SOURCE_STR="[ -s \"$KRE_USER_HOME/kvm/kvm.sh\" ] && . \"$KRE_USER_HOME/kvm/kvm.sh\" # this loads kvm"
 
-if [[ -z "$PROFILE" && -z "$ZPROFILE" ]] || [[ ! -f "$PROFILE" && ! -f "$ZPROFILE" ]] ; then
+if [ -z "$PROFILE" && -z "$ZPROFILE" ] || [ ! -f "$PROFILE" && ! -f "$ZPROFILE" ] ; then
   if [ -z "$PROFILE" ]; then
     echo "=> Profile not found. Tried ~/.bash_profile ~/.zshrc and ~/.profile."
     echo "=> Create one of them and run this script again"
-  elif [[ ! -f "$PROFILE" ]]; then
+  elif [ ! -f "$PROFILE" ]; then
     echo "=> Profile $PROFILE not found"
     echo "=> Create it (touch $PROFILE) and run this script again"
   else
@@ -83,8 +81,8 @@ if [[ -z "$PROFILE" && -z "$ZPROFILE" ]] || [[ ! -f "$PROFILE" && ! -f "$ZPROFIL
   echo "   $SOURCE_STR"
   echo
 else
-  [[ -n "$PROFILE" ]] && _kvmsetup_update_profile "$PROFILE" "$SOURCE_STR"
-  [[ -n "$ZPROFILE" ]] && _kvmsetup_update_profile "$ZPROFILE" "$SOURCE_STR"
+  [ -n "$PROFILE" ] && _kvmsetup_update_profile "$PROFILE" "$SOURCE_STR"
+  [ -n "$ZPROFILE" ] && _kvmsetup_update_profile "$ZPROFILE" "$SOURCE_STR"
 fi
 
 echo "=> Type 'source $KRE_USER_HOME/kvm/kvm.sh' to start using kvm"

From fe0b011f819d6b38159d3cf8297685a51f397bdb Mon Sep 17 00:00:00 2001
From: Graeme Christie <graeme@sx.net.au>
Date: Wed, 28 May 2014 01:35:28 +0800
Subject: [PATCH 23/26] Modified kvmsetup to use -a operator rather than &&

---
 kvmsetup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kvmsetup.sh b/kvmsetup.sh
index ecd48128c1..77f5cd42bc 100644
--- a/kvmsetup.sh
+++ b/kvmsetup.sh
@@ -64,7 +64,7 @@ fi
 
 SOURCE_STR="[ -s \"$KRE_USER_HOME/kvm/kvm.sh\" ] && . \"$KRE_USER_HOME/kvm/kvm.sh\" # this loads kvm"
 
-if [ -z "$PROFILE" && -z "$ZPROFILE" ] || [ ! -f "$PROFILE" && ! -f "$ZPROFILE" ] ; then
+if [ -z "$PROFILE" -a -z "$ZPROFILE" ] || [ ! -f "$PROFILE" -a ! -f "$ZPROFILE" ] ; then
   if [ -z "$PROFILE" ]; then
     echo "=> Profile not found. Tried ~/.bash_profile ~/.zshrc and ~/.profile."
     echo "=> Create one of them and run this script again"

From 030af218fb98e3b98275ec0304e040530e1f301b Mon Sep 17 00:00:00 2001
From: Graeme Christie <graeme@sx.net.au>
Date: Tue, 3 Jun 2014 18:34:49 +0800
Subject: [PATCH 24/26] Cleaned up kvm.sh and kvmsetup.sh Removed some
 redundant code

---
 kvm.sh      | 44 ++++----------------------------------------
 kvmsetup.sh | 36 ++++++++++++++++++------------------
 2 files changed, 22 insertions(+), 58 deletions(-)

diff --git a/kvm.sh b/kvm.sh
index 72ba9b951c..cdadd9e2ef 100644
--- a/kvm.sh
+++ b/kvm.sh
@@ -1,21 +1,12 @@
 # kvm.sh
 # Source this file from your .bash-profile or script to use
-# With inspriation from nvm.sh
-
-SCRIPTPATH="$_"
-
-#Exit script when any command returns non 0 exit code
-
 _kvm_has() {
   type "$1" > /dev/null 2>&1
   return $?
 }
 
-# Make zsh glob matching behave same as bash
-# This fixes the "zsh: no matches found" errors
 if _kvm_has "unsetopt"; then
   unsetopt nomatch 2>/dev/null
-  KVM_CD_FLAGS="-q"
 fi
 
 if [ -z "$KRE_USER_HOME" ]; then
@@ -28,32 +19,6 @@ KRE_X86=
 KRE_X64=
 KRE_NUGET_API_URL="https://www.myget.org/F/aspnetvnext/api/v2"
 
-# Traverse up in directory tree to find containing folder
-_kvm_find_up() {
-  local path
-  path=$PWD
-  while [ "$path" != "" ] && [ ! -f "$path/$1" ]; do
-    path=${path%/*}
-  done
-  echo "$path"
-}
-
-_kvm_find_kvmrc() {
-  local dir="$(_kvm_find_up '.kvmrc')"
-  if [ -e "$dir/.kvmrc" ]; then
-        echo "$dir/.kvmrc"
-  fi
-}
-
-# Obtain kvm version from rc file
-_kvm_rc_version() {
-  local KVMRC_PATH="$(_kvm_find_kvmrc)"
-  if [ -e "$KVMRC_PATH" ]; then
-    _kvm_rc_version=`cat "$KVMRC_PATH" | head -n 1`
-    echo "Found '$KVMRC_PATH' with version <$_kvm_rc_version>"
-  fi
-}
-
 _kvm_find_latest() {
   local platform="mono45"
   local architecture="x86"
@@ -139,7 +104,7 @@ _kvm_unpack() {
 
 }
 
-# This is not really needed. Placeholder until I get clarification on the supported platforms for mono
+# This is not currently required. Placeholder for the case when we have multiple platforms  (ie if we bundle mono)
 _kvm_requested_platform() {
   local default=$1
 
@@ -148,7 +113,7 @@ _kvm_requested_platform() {
   echo $default
 }
 
-# Ditto - waiting for clarification on mono-x64 packages
+# This is not currently required. Placeholder for the case where we have multiple architectures (ie if we bundle mono)
 _kvm_requested_architecture() {
   local default=$1
 
@@ -181,7 +146,6 @@ _kvm_requested_version_or_alias() {
 # This will be more relevant if we support global installs
 _kvm_locate_kre_bin_from_full_name() {
   local kreFullName=$1
-
   [ -e "$KRE_USER_PACKAGES/$kreFullName/bin" ] && echo "$KRE_USER_PACKAGES/$kreFullName/bin" && return
 }
 
@@ -289,9 +253,9 @@ kvm()
         PATH=`_kvm_strip_path "$PATH" "/bin"`
 
         if [[ -n $persistent && -e "$KRE_USER_HOME/alias/default.alias" ]]; then
-            echo "Setting default KRE to none"
+          echo "Setting default KRE to none"
 
-            rm "$KRE_USER_HOME/alias/default.alias"
+          rm "$KRE_USER_HOME/alias/default.alias"
         fi
         return 0
       fi
diff --git a/kvmsetup.sh b/kvmsetup.sh
index 77f5cd42bc..5546575a68 100644
--- a/kvmsetup.sh
+++ b/kvmsetup.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -e
-
 _kvmsetup_has() {
   type "$1" > /dev/null 2>&1
   return $?
@@ -11,7 +9,7 @@ _kvmsetup_update_profile() {
   local profile="$1"
   local sourceString="$2"
   if ! grep -qc 'kvm.sh' $profile; then
-    echo "=> Appending source string to $profile"
+    echo "Appending source string to $profile"
     echo "" >> "$profile"
     echo $sourceString >> "$profile"
   else
@@ -35,9 +33,9 @@ fi
 # Downloading to $KVM_DIR
 mkdir -p "$KRE_USER_HOME/kvm"
 if [ -s "$KRE_USER_HOME/kvm/kvm.sh" ]; then
-  echo "=> kvm is already installed in $KRE_USER_HOME/kvm, trying to update"
+  echo "kvm is already installed in $KRE_USER_HOME/kvm, trying to update"
 else
-  echo "=> Downloading kvm as script to '$KRE_USER_HOME/kvm'"
+  echo "Downloading kvm as script to '$KRE_USER_HOME/kvm'"
 fi
 
 curl -s "$KVM_SOURCE" -o "$KRE_USER_HOME/kvm/kvm.sh" || {
@@ -58,31 +56,33 @@ if [ -z "$PROFILE" ]; then
   fi
 fi
 
-if [ -f "$HOME/.zshrc" ]; then
-  ZPROFILE="$HOME/.zshrc"
+if [ -z "$PROFILE" ]; then
+  if [ -f "$HOME/.zshrc" ]; then
+    ZPROFILE="$HOME/.zshrc"
+  fi
 fi
 
-SOURCE_STR="[ -s \"$KRE_USER_HOME/kvm/kvm.sh\" ] && . \"$KRE_USER_HOME/kvm/kvm.sh\" # this loads kvm"
+SOURCE_STR="[ -s \"$KRE_USER_HOME/kvm/kvm.sh\" ] && . \"$KRE_USER_HOME/kvm/kvm.sh\" # Load kvm"
 
 if [ -z "$PROFILE" -a -z "$ZPROFILE" ] || [ ! -f "$PROFILE" -a ! -f "$ZPROFILE" ] ; then
   if [ -z "$PROFILE" ]; then
-    echo "=> Profile not found. Tried ~/.bash_profile ~/.zshrc and ~/.profile."
-    echo "=> Create one of them and run this script again"
+    echo "Profile not found. Tried ~/.bash_profile ~/.zshrc and ~/.profile."
+    echo "Create one of them and run this script again"
   elif [ ! -f "$PROFILE" ]; then
-    echo "=> Profile $PROFILE not found"
-    echo "=> Create it (touch $PROFILE) and run this script again"
+    echo "Profile $PROFILE not found"
+    echo "Create it (touch $PROFILE) and run this script again"
   else
-    echo "=> Profile $ZPROFILE not found"
-    echo "=> Create it (touch $ZPROFILE) and run this script again"
+    echo "Profile $ZPROFILE not found"
+    echo "Create it (touch $ZPROFILE) and run this script again"
   fi
-  echo "   OR"
-  echo "=> Append the following line to the correct file yourself:"
+  echo "  OR"
+  echo "Append the following line to the correct file yourself:"
   echo
-  echo "   $SOURCE_STR"
+  echo " $SOURCE_STR"
   echo
 else
   [ -n "$PROFILE" ] && _kvmsetup_update_profile "$PROFILE" "$SOURCE_STR"
   [ -n "$ZPROFILE" ] && _kvmsetup_update_profile "$ZPROFILE" "$SOURCE_STR"
 fi
 
-echo "=> Type 'source $KRE_USER_HOME/kvm/kvm.sh' to start using kvm"
+echo "Type 'source $KRE_USER_HOME/kvm/kvm.sh' to start using kvm"

From b26d08ba30b1b8ab06b1d7cfcf64769411d0d31c Mon Sep 17 00:00:00 2001
From: Graeme Christie <graeme@sx.net.au>
Date: Tue, 3 Jun 2014 21:25:55 +0800
Subject: [PATCH 25/26] Fixed indentation on bash scripts

---
 kvm.sh      | 517 ++++++++++++++++++++++++++--------------------------
 kvmsetup.sh |  92 +++++-----
 2 files changed, 301 insertions(+), 308 deletions(-)

diff --git a/kvm.sh b/kvm.sh
index cdadd9e2ef..7a252d2944 100644
--- a/kvm.sh
+++ b/kvm.sh
@@ -1,16 +1,16 @@
 # kvm.sh
 # Source this file from your .bash-profile or script to use
 _kvm_has() {
-  type "$1" > /dev/null 2>&1
-  return $?
+    type "$1" > /dev/null 2>&1
+    return $?
 }
 
 if _kvm_has "unsetopt"; then
-  unsetopt nomatch 2>/dev/null
+    unsetopt nomatch 2>/dev/null
 fi
 
 if [ -z "$KRE_USER_HOME" ]; then
-  eval KRE_USER_HOME=~/.kre
+    eval KRE_USER_HOME=~/.kre
 fi
 
 KRE_USER_PACKAGES="$KRE_USER_HOME/packages"
@@ -20,325 +20,318 @@ KRE_X64=
 KRE_NUGET_API_URL="https://www.myget.org/F/aspnetvnext/api/v2"
 
 _kvm_find_latest() {
-  local platform="mono45"
-  local architecture="x86"
+    local platform="mono45"
+    local architecture="x86"
 
-  if ! _kvm_has "curl"; then
-    echo 'KVM Needs curl to proceed.' >&2;
-    return 1
-  fi
+    if ! _kvm_has "curl"; then
+        echo 'KVM Needs curl to proceed.' >&2;
+        return 1
+    fi
 
-  local url="$KRE_NUGET_API_URL/GetUpdates()?packageIds=%27KRE-$platform-$architecture%27&versions=%270.0%27&includePrerelease=true&includeAllVersions=false"
-  local cmd=
-  local xml="$(curl $url 2>/dev/null)"
-  version="$(echo $xml | sed 's/.*<[a-zA-Z]:Version>\([^<]*\).*/\1/')"
-  [[ $xml == $version ]] && return 1
-  echo $version
+    local url="$KRE_NUGET_API_URL/GetUpdates()?packageIds=%27KRE-$platform-$architecture%27&versions=%270.0%27&includePrerelease=true&includeAllVersions=false"
+    local cmd=
+    local xml="$(curl $url 2>/dev/null)"
+    version="$(echo $xml | sed 's/.*<[a-zA-Z]:Version>\([^<]*\).*/\1/')"
+    [[ $xml == $version ]] && return 1
+    echo $version
 }
 
 _kvm_strip_path() {
-  echo "$1" | sed -e "s#$KRE_USER_PACKAGES/[^/]*$2[^:]*:##g" -e "s#:$KRE_USER_PACKAGES/[^/]*$2[^:]*##g" -e "s#$KRE_USER_PACKAGES/[^/]*$2[^:]*##g"
+    echo "$1" | sed -e "s#$KRE_USER_PACKAGES/[^/]*$2[^:]*:##g" -e "s#:$KRE_USER_PACKAGES/[^/]*$2[^:]*##g" -e "s#$KRE_USER_PACKAGES/[^/]*$2[^:]*##g"
 }
 
 _kvm_prepend_path() {
-  if [ -z "$1" ]; then
-    echo "$2"
-  else
-    echo "$2:$1"
-  fi
+    if [ -z "$1" ]; then
+        echo "$2"
+    else
+        echo "$2:$1"
+    fi
 }
 
 _kvm_download() {
-  local kreFullName="$1"
-  local kreFolder="$2"
+    local kreFullName="$1"
+    local kreFolder="$2"
 
-  local pkgName=$(echo "$kreFullName" | sed "s/\([^.]*\).*/\1/")
-  local pkgVersion=$(echo "$kreFullName" | sed "s/[^.]*.\(.*\)/\1/")
-  local url="$KRE_NUGET_API_URL/package/$pkgName/$pkgVersion"
-  local kreFile="$kreFolder/$kreFullName.nupkg"
+    local pkgName=$(echo "$kreFullName" | sed "s/\([^.]*\).*/\1/")
+    local pkgVersion=$(echo "$kreFullName" | sed "s/[^.]*.\(.*\)/\1/")
+    local url="$KRE_NUGET_API_URL/package/$pkgName/$pkgVersion"
+    local kreFile="$kreFolder/$kreFullName.nupkg"
 
-  if [ -e "$kreFolder" ]; then
-    echo "$kreFullName already installed."
-    return 0
-  fi
+    if [ -e "$kreFolder" ]; then
+        echo "$kreFullName already installed."
+        return 0
+    fi
 
-  echo "Downloading $kreFullName from $KRE_NUGET_API_URL"
+    echo "Downloading $kreFullName from $KRE_NUGET_API_URL"
 
-  if ! _kvm_has "curl"; then
-    echo "KVM Needs curl to proceed." >&2;
-    return 1
-  fi
+    if ! _kvm_has "curl"; then
+        echo "KVM Needs curl to proceed." >&2;
+        return 1
+    fi
 
-  mkdir -p "$kreFolder" > /dev/null 2>&1
+    mkdir -p "$kreFolder" > /dev/null 2>&1
 
-  local httpResult=$(curl -L -D - -u aspnetreadonly:4d8a2d9c-7b80-4162-9978-47e918c9658c "$url" -o "$kreFile" 2>/dev/null | grep "^HTTP/1.1" | head -n 1 | sed "s/HTTP.1.1 \([0-9]*\).*/\1/")
+    local httpResult=$(curl -L -D - -u aspnetreadonly:4d8a2d9c-7b80-4162-9978-47e918c9658c "$url" -o "$kreFile" 2>/dev/null | grep "^HTTP/1.1" | head -n 1 | sed "s/HTTP.1.1 \([0-9]*\).*/\1/")
 
-  [[ $httpResult == "404" ]] && echo "$kreFullName was not found in repository $KRE_NUGET_API_URL" && return 1
-  [[ $httpResult != "302" ]] && echo "Http Error $httpResult fetching $kreFullName from $KRE_NUGET_API_URL" && return 1
+    [[ $httpResult == "404" ]] && echo "$kreFullName was not found in repository $KRE_NUGET_API_URL" && return 1
+    [[ $httpResult != "302" ]] && echo "Http Error $httpResult fetching $kreFullName from $KRE_NUGET_API_URL" && return 1
 
-  _kvm_unpack $kreFile $kreFolder
+    _kvm_unpack $kreFile $kreFolder
 }
 
 _kvm_unpack() {
-  local kreFile="$1"
-  local kreFolder="$2"
+    local kreFile="$1"
+    local kreFolder="$2"
 
-  echo "Installing to $kreFolder"
+    echo "Installing to $kreFolder"
 
-  if ! _kvm_has "unzip"; then
-    echo "KVM Needs unzip to proceed." >&2;
-    return 1
-  fi
+    if ! _kvm_has "unzip"; then
+        echo "KVM Needs unzip to proceed." >&2;
+        return 1
+    fi
 
-  unzip $kreFile -d $kreFolder > /dev/null 2>&1
+    unzip $kreFile -d $kreFolder > /dev/null 2>&1
 
-  [ -e "$kreFolder/[Content_Types].xml" ] && rm "$kreFolder/[Content_Types].xml"
+    [ -e "$kreFolder/[Content_Types].xml" ] && rm "$kreFolder/[Content_Types].xml"
 
-  [ -e "$kreFolder/_rels/" ] && rm -rf "$kreFolder/_rels/"
+    [ -e "$kreFolder/_rels/" ] && rm -rf "$kreFolder/_rels/"
 
-  [ -e "$kreFolder/package/" ] && rm -rf "$kreFolder/_package/"
-
-  #Set shell commands as executable
-  find "$kreFolder/bin/" -type f \
-    -exec sh -c "head -c 11 {} | grep '/bin/bash' > /dev/null"  \; -print | xargs chmod 775
+    [ -e "$kreFolder/package/" ] && rm -rf "$kreFolder/_package/"
 
+    #Set shell commands as executable
+    find "$kreFolder/bin/" -type f \
+        -exec sh -c "head -c 11 {} | grep '/bin/bash' > /dev/null"  \; -print | xargs chmod 775
 }
 
 # This is not currently required. Placeholder for the case when we have multiple platforms  (ie if we bundle mono)
 _kvm_requested_platform() {
-  local default=$1
-
-  [[ -z $KRE_MONO45 ]] && echo "mono45" && return
-
-  echo $default
+    local default=$1
+    [[ -z $KRE_MONO45 ]] && echo "mono45" && return
+    echo $default
 }
 
 # This is not currently required. Placeholder for the case where we have multiple architectures (ie if we bundle mono)
 _kvm_requested_architecture() {
-  local default=$1
+    local default=$1
 
-  [[ -n $KRE_X86 && -n $KRE_X64 ]] && echo "This command cannot accept both -x86 and -x64" && return 1
-
-  [[ -z $KRE_X86 ]] && echo "x86" && return
-
-  [[ -z $KRE_X64 ]] && echo "x64" && return
-
-  echo $default
+    [[ -n $KRE_X86 && -n $KRE_X64 ]] && echo "This command cannot accept both -x86 and -x64" && return 1
+    [[ -z $KRE_X86 ]] && echo "x86" && return
+    [[ -z $KRE_X64 ]] && echo "x64" && return
+    echo $default
 }
 
 _kvm_requested_version_or_alias() {
-  local versionOrAlias="$1"
+    local versionOrAlias="$1"
 
-  if [ -e "$KRE_USER_HOME/alias/$versionOrAlias.alias" ]; then
-    local kreFullName=$(cat "$KRE_USER_HOME/alias/$versionOrAlias.alias")
-    local pkgName=$(echo $kreFullName | sed "s/\([^.]*\).*/\1/")
-    local pkgVersion=$(echo $kreFullName | sed "s/[^.]*.\(.*\)/\1/")
-    local pkgPlatform=$(_kvm_requested_platform $(echo "$pkgName" | sed "s/KRE-\([^-]*\).*/\1/"))
-    local pkgArchitecture=$(_kvm_requested_architecture $(echo "$pkgName" | sed "s/.*-.*-\([^-]*\).*/\1/"))
-  else
-    local pkgVersion=$versionOrAlias
-    local pkgPlatform=$(_kvm_requested_platform "mono45")
-    local pkgArchitecture=$(_kvm_requested_architecture "x86")
-  fi
-  echo "KRE-$pkgPlatform-$pkgArchitecture.$pkgVersion"
+    if [ -e "$KRE_USER_HOME/alias/$versionOrAlias.alias" ]; then
+        local kreFullName=$(cat "$KRE_USER_HOME/alias/$versionOrAlias.alias")
+        local pkgName=$(echo $kreFullName | sed "s/\([^.]*\).*/\1/")
+        local pkgVersion=$(echo $kreFullName | sed "s/[^.]*.\(.*\)/\1/")
+        local pkgPlatform=$(_kvm_requested_platform $(echo "$pkgName" | sed "s/KRE-\([^-]*\).*/\1/"))
+        local pkgArchitecture=$(_kvm_requested_architecture $(echo "$pkgName" | sed "s/.*-.*-\([^-]*\).*/\1/"))
+    else
+        local pkgVersion=$versionOrAlias
+        local pkgPlatform=$(_kvm_requested_platform "mono45")
+        local pkgArchitecture=$(_kvm_requested_architecture "x86")
+    fi
+    echo "KRE-$pkgPlatform-$pkgArchitecture.$pkgVersion"
 }
 
 # This will be more relevant if we support global installs
 _kvm_locate_kre_bin_from_full_name() {
-  local kreFullName=$1
-  [ -e "$KRE_USER_PACKAGES/$kreFullName/bin" ] && echo "$KRE_USER_PACKAGES/$kreFullName/bin" && return
+    local kreFullName=$1
+    [ -e "$KRE_USER_PACKAGES/$kreFullName/bin" ] && echo "$KRE_USER_PACKAGES/$kreFullName/bin" && return
 }
 
 kvm()
 {
-  if [ $# -lt 1 ]; then
-    kvm help
-    return
-  fi
-
-  case $1 in
-    "help" )
-      echo ""
-      echo "K Runtime Environment Version Manager - Build {{BUILD_NUMBER}}"
-      echo ""
-      echo "USAGE: kvm <command> [options]"
-      echo ""
-      echo "kvm upgrade"
-      echo "install latest KRE from feed"
-      echo "set 'default' alias to installed version"
-      echo "add KRE bin to user PATH environment variable persistently"
-      echo ""
-      echo "kvm install <semver>|<alias>|<nupkg>"
-      echo "install requested KRE from feed"
-      echo "add KRE bin to path of current command line"
-      echo ""
-      echo "kvm use <semver>|<alias>|none [-p -persistent]"
-      echo "<semver>|<alias>  add KRE bin to path of current command line   "
-      echo "none              remove KRE bin from path of current command line"
-      echo "-p -persistent   set selected version as default"
-      echo ""
-      echo "kvm list"
-      echo "list KRE versions installed "
-      echo ""
-      echo "kvm alias"
-      echo "list KRE aliases which have been defined"
-      echo ""
-      echo "kvm alias <alias>"
-      echo "display value of named alias"
-      echo ""
-      echo "kvm alias <alias> <semver>"
-      echo "set alias to specific version"
-      echo ""
-      echo ""
-    ;;
-
-    "upgrade" )
-      [ $# -ne 1 ] && kvm help && return
-      echo "Determining latest version"
-      local version=$(_kvm_find_latest mono45 x86)
-      echo $version
-      kvm install $version
-      kvm alias default $version
-    ;;
-
-    "install" )
-      [ $# -ne 2 ] && kvm help && return
-
-      local versionOrAlias="$2"
-
-      if [ "$versionOrAlias" == *.nupkg ]; then
-        local kreFullName=$(echo $versionOrAlias | sed "s/\(.*\)\.nupkg/\1/")
-        local kreFolder="$KRE_USER_PACKAGES/$kreFullName"
-        local kreFile="$kreFolder/$kreFullName.nupkg"
-
-        if [ -e "$kreFolder" ]; then
-          echo "Target folder '$kreFolder' already exists"
-        else
-          mkdir "$kreFolder" > /dev/null 2>&1
-          cp -a "$versionOrAlias" "$kreFile"
-          _kvm_unpack "$kreFile" "$kreFolder"
-        fi
-
-        echo "Adding $kreBin to current PATH"
-        PATH=$(_kvm_strip_path "$PATH" "/bin")
-        PATH=(_kvm_prepend_path "$PATH" "$kreBin")
-      else
-        local kreFullName="$(_kvm_requested_version_or_alias $versionOrAlias)"
-        local kreFolder="$KRE_USER_PACKAGES/$kreFullName"
-        _kvm_download "$kreFullName" "$kreFolder"
-        kvm use "$versionOrAlias"
-      fi
-    ;;
-
-    "use" )
-      [ $# -gt 3 ] && kvm help && return
-      [ $# -lt 2 ] && kvm help && return
-
-      shift
-      local persistant=
-
-      while [ $# -ne 0 ]
-      do
-        if [[ $1 == "-p" || $1 == "-persistant" ]]; then
-          local persistant="true"
-        else
-          local versionOrAlias=$1
-        fi
-        shift
-      done
-
-      if [[ $versionOrAlias == "none" ]]; then
-        echo "Removing KRE from process PATH"
-        # Strip other version from PATH
-        PATH=`_kvm_strip_path "$PATH" "/bin"`
-
-        if [[ -n $persistent && -e "$KRE_USER_HOME/alias/default.alias" ]]; then
-          echo "Setting default KRE to none"
-
-          rm "$KRE_USER_HOME/alias/default.alias"
-        fi
-        return 0
-      fi
-
-      local kreFullName=$(_kvm_requested_version_or_alias "$versionOrAlias")
-      local kreBin=$(_kvm_locate_kre_bin_from_full_name "$kreFullName")
-
-      if [[ -z $kreBin ]]; then
-        echo "Cannot find $kreFullName, do you need to run 'kvm install $versionOrAlias'?"
-        return 1
-      fi
-
-      echo "Adding" $kreBin "to process PATH"
-
-      PATH=`_kvm_strip_path "$PATH" "/bin"`
-      PATH=`_kvm_prepend_path "$PATH" "$kreBin"`
-
-      if [[ -n $persistent ]]; then
-          echo "Setting  $kreBin as default KRE"
-          kvm alias default "$versionOrAlias"
-      fi
-    ;;
-
-    "alias" )
-      [[ $# -gt 3 ]] && kvm help && return
-
-      if [[ $# == 1 ]]; then
-        for f in $(find "$KRE_USER_HOME/alias" -name *.alias); do printf "%-20s %s\n" "$(basename $f | sed 's/.alias//')" "$(cat $f)"; done
-        echo ""
-        return;
-      fi
-
-      local name="$2"
-
-      if [[ $# == 2 ]]; then
-        [[ ! -e "$KRE_USER_HOME/alias/$name.alias" ]] && echo "There is no alias called '$name'" && return
-        cat "$KRE_USER_HOME/alias/$name.alias"
-        echo ""
+    if [ $# -lt 1 ]; then
+        kvm help
         return
-      fi
+    fi
 
-      local semver="$3"
-      local kreFullName="KRE-$(_kvm_requested_platform mono45)-$(_kvm_requested_architecture x86).$semver"
+    case $1 in
+        "help" )
+            echo ""
+            echo "K Runtime Environment Version Manager - Build {{BUILD_NUMBER}}"
+            echo ""
+            echo "USAGE: kvm <command> [options]"
+            echo ""
+            echo "kvm upgrade"
+            echo "install latest KRE from feed"
+            echo "set 'default' alias to installed version"
+            echo "add KRE bin to user PATH environment variable persistently"
+            echo ""
+            echo "kvm install <semver>|<alias>|<nupkg>"
+            echo "install requested KRE from feed"
+            echo "add KRE bin to path of current command line"
+            echo ""
+            echo "kvm use <semver>|<alias>|none [-p -persistent]"
+            echo "<semver>|<alias>  add KRE bin to path of current command line   "
+            echo "none              remove KRE bin from path of current command line"
+            echo "-p -persistent   set selected version as default"
+            echo ""
+            echo "kvm list"
+            echo "list KRE versions installed "
+            echo ""
+            echo "kvm alias"
+            echo "list KRE aliases which have been defined"
+            echo ""
+            echo "kvm alias <alias>"
+            echo "display value of named alias"
+            echo ""
+            echo "kvm alias <alias> <semver>"
+            echo "set alias to specific version"
+            echo ""
+            echo ""
+        ;;
 
-      [[ ! -d "$KRE_USER_PACKAGES/$kreFullName" ]] && echo "$semver is not an installed KRE version." && return 1
+        "upgrade" )
+            [ $# -ne 1 ] && kvm help && return
+            echo "Determining latest version"
+            local version=$(_kvm_find_latest mono45 x86)
+            echo $version
+            kvm install $version
+            kvm alias default $version
+        ;;
 
-      echo "Setting alias '$name' to '$kreFullName'"
-      [[ ! -e "$KRE_USER_HOME/alias/" ]] && mkdir "$KRE_USER_HOME/alias/" > /dev/null
+        "install" )
+            [ $# -ne 2 ] && kvm help && return
 
-      echo "$kreFullName" > "$KRE_USER_HOME/alias/$name.alias"
-    ;;
+            local versionOrAlias="$2"
 
-    "list" )
-      [[ $# -gt 2 ]] && kvm help && return
+            if [ "$versionOrAlias" == *.nupkg ]; then
+                local kreFullName=$(echo $versionOrAlias | sed "s/\(.*\)\.nupkg/\1/")
+                local kreFolder="$KRE_USER_PACKAGES/$kreFullName"
+                local kreFile="$kreFolder/$kreFullName.nupkg"
 
-      [[ ! -d $KRE_USER_PACKAGES ]] && echo "KRE is not installed." && return 1
+                if [ -e "$kreFolder" ]; then
+                  echo "Target folder '$kreFolder' already exists"
+                else
+                  mkdir "$kreFolder" > /dev/null 2>&1
+                  cp -a "$versionOrAlias" "$kreFile"
+                  _kvm_unpack "$kreFile" "$kreFolder"
+                fi
 
-      local searchGlob="KRE-*"
-      if [ $# == 2 ]; then
-        local versionOrAlias=$2
-        local searchGlob=$(_kvm_requested_version_or_alias "$versionOrAlias")
-        echo $searchGlob
-      fi
+                echo "Adding $kreBin to current PATH"
+                PATH=$(_kvm_strip_path "$PATH" "/bin")
+                PATH=(_kvm_prepend_path "$PATH" "$kreBin")
+            else
+                local kreFullName="$(_kvm_requested_version_or_alias $versionOrAlias)"
+                local kreFolder="$KRE_USER_PACKAGES/$kreFullName"
+                _kvm_download "$kreFullName" "$kreFolder"
+                kvm use "$versionOrAlias"
+            fi
+        ;;
 
-      for f in $(find $KRE_USER_PACKAGES/* -name $searchGlob -type d -prune -exec basename {} \;); do
-        #TODO: Format, extract package, version arch etc
-        echo -n $f
-        if [[ $PATH == *"$KRE_USER_PACKAGES/$f/bin"* ]]; then
-          echo " *"
-        else
-          echo ""
-        fi
-        [[ $# == 2 ]] && echo "" &&  return 0
-      done
+        "use" )
+            [ $# -gt 3 ] && kvm help && return
+            [ $# -lt 2 ] && kvm help && return
 
-      echo ""
-      [[ $# == 2 ]] && return 1 # kvm list xxx - xxx was not found
-      ;;
+            shift
+            local persistant=
 
-    *)
-      echo "Unknown command $1"
-      return 1
-  esac
+            while [ $# -ne 0 ]
+            do
+                if [[ $1 == "-p" || $1 == "-persistant" ]]; then
+                    local persistant="true"
+                else
+                    local versionOrAlias=$1
+                fi
+                shift
+            done
+
+            if [[ $versionOrAlias == "none" ]]; then
+                echo "Removing KRE from process PATH"
+                # Strip other version from PATH
+                PATH=`_kvm_strip_path "$PATH" "/bin"`
+
+                if [[ -n $persistent && -e "$KRE_USER_HOME/alias/default.alias" ]]; then
+                    echo "Setting default KRE to none"
+                    rm "$KRE_USER_HOME/alias/default.alias"
+                fi
+                return 0
+            fi
+
+            local kreFullName=$(_kvm_requested_version_or_alias "$versionOrAlias")
+            local kreBin=$(_kvm_locate_kre_bin_from_full_name "$kreFullName")
+
+            if [[ -z $kreBin ]]; then
+                echo "Cannot find $kreFullName, do you need to run 'kvm install $versionOrAlias'?"
+                return 1
+            fi
+
+            echo "Adding" $kreBin "to process PATH"
+
+            PATH=`_kvm_strip_path "$PATH" "/bin"`
+            PATH=`_kvm_prepend_path "$PATH" "$kreBin"`
+
+            if [[ -n $persistent ]]; then
+                echo "Setting  $kreBin as default KRE"
+                kvm alias default "$versionOrAlias"
+            fi
+        ;;
+
+        "alias" )
+            [[ $# -gt 3 ]] && kvm help && return
+
+            if [[ $# == 1 ]]; then
+                for f in $(find "$KRE_USER_HOME/alias" -name *.alias); do printf "%-20s %s\n" "$(basename $f | sed 's/.alias//')" "$(cat $f)"; done
+                echo ""
+                return
+            fi
+
+            local name="$2"
+
+            if [[ $# == 2 ]]; then
+                [[ ! -e "$KRE_USER_HOME/alias/$name.alias" ]] && echo "There is no alias called '$name'" && return
+                cat "$KRE_USER_HOME/alias/$name.alias"
+                echo ""
+                return
+            fi
+
+            local semver="$3"
+            local kreFullName="KRE-$(_kvm_requested_platform mono45)-$(_kvm_requested_architecture x86).$semver"
+
+            [[ ! -d "$KRE_USER_PACKAGES/$kreFullName" ]] && echo "$semver is not an installed KRE version." && return 1
+
+            echo "Setting alias '$name' to '$kreFullName'"
+            [[ ! -e "$KRE_USER_HOME/alias/" ]] && mkdir "$KRE_USER_HOME/alias/" > /dev/null
+
+            echo "$kreFullName" > "$KRE_USER_HOME/alias/$name.alias"
+        ;;
+
+        "list" )
+            [[ $# -gt 2 ]] && kvm help && return
+
+            [[ ! -d $KRE_USER_PACKAGES ]] && echo "KRE is not installed." && return 1
+
+            local searchGlob="KRE-*"
+            if [ $# == 2 ]; then
+                local versionOrAlias=$2
+                local searchGlob=$(_kvm_requested_version_or_alias "$versionOrAlias")
+                echo $searchGlob
+            fi
+
+            for f in $(find $KRE_USER_PACKAGES/* -name $searchGlob -type d -prune -exec basename {} \;); do
+                #TODO: Format, extract package, version arch etc
+                echo -n $f
+                if [[ $PATH == *"$KRE_USER_PACKAGES/$f/bin"* ]]; then
+                    echo " *"
+                else
+                    echo ""
+                fi
+                [[ $# == 2 ]] && echo "" &&  return 0
+            done
+
+            echo ""
+            [[ $# == 2 ]] && return 1 # kvm list xxx - xxx was not found
+        ;;
+
+        *)
+            echo "Unknown command $1"
+            return 1
+    esac
 }
 
 kvm list default >/dev/null && kvm use default >/dev/null || true
diff --git a/kvmsetup.sh b/kvmsetup.sh
index 5546575a68..a774efdb58 100644
--- a/kvmsetup.sh
+++ b/kvmsetup.sh
@@ -1,88 +1,88 @@
 #!/bin/bash
 
 _kvmsetup_has() {
-  type "$1" > /dev/null 2>&1
-  return $?
+    type "$1" > /dev/null 2>&1
+    return $?
 }
 
 _kvmsetup_update_profile() {
-  local profile="$1"
-  local sourceString="$2"
-  if ! grep -qc 'kvm.sh' $profile; then
-    echo "Appending source string to $profile"
-    echo "" >> "$profile"
-    echo $sourceString >> "$profile"
-  else
-    echo "=> Source string already in $profile"
-  fi
+    local profile="$1"
+    local sourceString="$2"
+    if ! grep -qc 'kvm.sh' $profile; then
+        echo "Appending source string to $profile"
+        echo "" >> "$profile"
+        echo $sourceString >> "$profile"
+    else
+        echo "=> Source string already in $profile"
+    fi
 }
 
 if [ -z "$KRE_USER_HOME" ]; then
-  eval KRE_USER_HOME=~/.kre
+    eval KRE_USER_HOME=~/.kre
 fi
 
 if ! _kvmsetup_has "curl"; then
-  echo "kvmsetup requires curl to be installed"
-  return 1
+    echo "kvmsetup requires curl to be installed"
+    return 1
 fi
 
 if [ -z "$KVM_SOURCE" ]; then
-  KVM_SOURCE="https://raw.githubusercontent.com/graemechristie/Home/KvmShellImplementation/kvm.sh"
+    KVM_SOURCE="https://raw.githubusercontent.com/graemechristie/Home/KvmShellImplementation/kvm.sh"
 fi
 
 # Downloading to $KVM_DIR
 mkdir -p "$KRE_USER_HOME/kvm"
 if [ -s "$KRE_USER_HOME/kvm/kvm.sh" ]; then
-  echo "kvm is already installed in $KRE_USER_HOME/kvm, trying to update"
+    echo "kvm is already installed in $KRE_USER_HOME/kvm, trying to update"
 else
-  echo "Downloading kvm as script to '$KRE_USER_HOME/kvm'"
+    echo "Downloading kvm as script to '$KRE_USER_HOME/kvm'"
 fi
 
 curl -s "$KVM_SOURCE" -o "$KRE_USER_HOME/kvm/kvm.sh" || {
-  echo >&2 "Failed to download '$KVM_SOURCE'.."
-  return 1
+    echo >&2 "Failed to download '$KVM_SOURCE'.."
+    return 1
 }
 
 echo
 
 # Detect profile file if not specified as environment variable (eg: PROFILE=~/.myprofile).
 if [ -z "$PROFILE" ]; then
-  if [ -f "$HOME/.bash_profile" ]; then
-    PROFILE="$HOME/.bash_profile"
-  elif [ -f "$HOME/.bashrc" ]; then
-    PROFILE="$HOME/.bashrc"
-  elif [ -f "$HOME/.profile" ]; then
-    PROFILE="$HOME/.profile"
-  fi
+    if [ -f "$HOME/.bash_profile" ]; then
+        PROFILE="$HOME/.bash_profile"
+    elif [ -f "$HOME/.bashrc" ]; then
+        PROFILE="$HOME/.bashrc"
+    elif [ -f "$HOME/.profile" ]; then
+        PROFILE="$HOME/.profile"
+    fi
 fi
 
 if [ -z "$PROFILE" ]; then
-  if [ -f "$HOME/.zshrc" ]; then
-    ZPROFILE="$HOME/.zshrc"
-  fi
+    if [ -f "$HOME/.zshrc" ]; then
+        ZPROFILE="$HOME/.zshrc"
+    fi
 fi
 
 SOURCE_STR="[ -s \"$KRE_USER_HOME/kvm/kvm.sh\" ] && . \"$KRE_USER_HOME/kvm/kvm.sh\" # Load kvm"
 
 if [ -z "$PROFILE" -a -z "$ZPROFILE" ] || [ ! -f "$PROFILE" -a ! -f "$ZPROFILE" ] ; then
-  if [ -z "$PROFILE" ]; then
-    echo "Profile not found. Tried ~/.bash_profile ~/.zshrc and ~/.profile."
-    echo "Create one of them and run this script again"
-  elif [ ! -f "$PROFILE" ]; then
-    echo "Profile $PROFILE not found"
-    echo "Create it (touch $PROFILE) and run this script again"
-  else
-    echo "Profile $ZPROFILE not found"
-    echo "Create it (touch $ZPROFILE) and run this script again"
-  fi
-  echo "  OR"
-  echo "Append the following line to the correct file yourself:"
-  echo
-  echo " $SOURCE_STR"
-  echo
+    if [ -z "$PROFILE" ]; then
+      echo "Profile not found. Tried ~/.bash_profile ~/.zshrc and ~/.profile."
+      echo "Create one of them and run this script again"
+    elif [ ! -f "$PROFILE" ]; then
+      echo "Profile $PROFILE not found"
+      echo "Create it (touch $PROFILE) and run this script again"
+    else
+      echo "Profile $ZPROFILE not found"
+      echo "Create it (touch $ZPROFILE) and run this script again"
+    fi
+    echo "  OR"
+    echo "Append the following line to the correct file yourself:"
+    echo
+    echo " $SOURCE_STR"
+    echo
 else
-  [ -n "$PROFILE" ] && _kvmsetup_update_profile "$PROFILE" "$SOURCE_STR"
-  [ -n "$ZPROFILE" ] && _kvmsetup_update_profile "$ZPROFILE" "$SOURCE_STR"
+    [ -n "$PROFILE" ] && _kvmsetup_update_profile "$PROFILE" "$SOURCE_STR"
+    [ -n "$ZPROFILE" ] && _kvmsetup_update_profile "$ZPROFILE" "$SOURCE_STR"
 fi
 
 echo "Type 'source $KRE_USER_HOME/kvm/kvm.sh' to start using kvm"

From 3bec520b0eee5ad5b90647c6083101c92f8a113a Mon Sep 17 00:00:00 2001
From: Graeme Christie <graeme@sx.net.au>
Date: Tue, 3 Jun 2014 22:29:48 +0800
Subject: [PATCH 26/26] Fixed issue where ZPROFILE would not be set and zshrc
 not updated

---
 kvmsetup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kvmsetup.sh b/kvmsetup.sh
index a774efdb58..870ec93bf5 100644
--- a/kvmsetup.sh
+++ b/kvmsetup.sh
@@ -56,7 +56,7 @@ if [ -z "$PROFILE" ]; then
     fi
 fi
 
-if [ -z "$PROFILE" ]; then
+if [ -z "$ZPROFILE" ]; then
     if [ -f "$HOME/.zshrc" ]; then
         ZPROFILE="$HOME/.zshrc"
     fi