Skip to content

Commit dfea4ee

Browse files
committed
Updated kvm build
1 parent 9d505f5 commit dfea4ee

File tree

2 files changed

+20
-39
lines changed

2 files changed

+20
-39
lines changed

kvm.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ $scriptPath = $myInvocation.MyCommand.Definition
4545

4646
function Kvm-Help {
4747
@"
48-
K Runtime Environment Version Manager - Build 10015
48+
K Runtime Environment Version Manager - Build 10017
4949
5050
USAGE: kvm <command> [options]
5151

kvm.sh

Lines changed: 19 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,19 @@ if [ -z "$KRE_USER_HOME" ]; then
1414
fi
1515

1616
KRE_USER_PACKAGES="$KRE_USER_HOME/packages"
17-
KRE_MONO45=
18-
KRE_X86=
19-
KRE_X64=
2017
if [ -z "$KRE_FEED" ]; then
2118
KRE_FEED="https://www.myget.org/F/aspnetvnext/api/v2"
2219
fi
2320

2421
_kvm_find_latest() {
25-
local platform="mono45"
26-
local architecture="x86"
22+
local platform="Mono"
2723

2824
if ! _kvm_has "curl"; then
2925
echo 'KVM Needs curl to proceed.' >&2;
3026
return 1
3127
fi
3228

33-
local url="$KRE_FEED/GetUpdates()?packageIds=%27KRE-$platform-$architecture%27&versions=%270.0%27&includePrerelease=true&includeAllVersions=false"
29+
local url="$KRE_FEED/GetUpdates()?packageIds=%27KRE-$platform%27&versions=%270.0%27&includePrerelease=true&includeAllVersions=false"
3430
xml="$(curl $url 2>/dev/null)"
3531
echo $xml | grep \<[a-zA-Z]:Version\>* >> /dev/null || return 1
3632
version="$(echo $xml | sed 's/.*<[a-zA-Z]:Version>\([^<]*\).*/\1/')"
@@ -61,7 +57,7 @@ _kvm_package_name() {
6157

6258
_kvm_package_runtime() {
6359
local kreFullName="$1"
64-
echo "$kreFullName" | sed "s/KRE-\([^-]*\).*/\1/"
60+
echo "$kreFullName" | sed "s/KRE-\([^.-]*\).*/\1/"
6561
}
6662

6763
_kvm_download() {
@@ -93,6 +89,7 @@ _kvm_download() {
9389
[[ $httpResult != "302" && $httpResult != "200" ]] && echo "HTTP Error $httpResult fetching $kreFullName from $KRE_FEED" && return 1
9490

9591
_kvm_unpack $kreFile $kreFolder
92+
return $?
9693
}
9794

9895
_kvm_unpack() {
@@ -119,38 +116,20 @@ _kvm_unpack() {
119116
-exec sh -c "head -c 11 {} | grep '/bin/bash' > /dev/null" \; -print | xargs chmod 775
120117
}
121118

122-
# This is not currently required. Placeholder for the case when we have multiple platforms (ie if we bundle mono)
123-
_kvm_requested_platform() {
124-
local default=$1
125-
[[ -z $KRE_MONO45 ]] && echo "mono45" && return
126-
echo $default
127-
}
128-
129-
# This is not currently required. Placeholder for the case where we have multiple architectures (ie if we bundle mono)
130-
_kvm_requested_architecture() {
131-
local default=$1
132-
133-
[[ -n $KRE_X86 && -n $KRE_X64 ]] && echo "This command cannot accept both -x86 and -x64" && return 1
134-
[[ -z $KRE_X86 ]] && echo "x86" && return
135-
[[ -z $KRE_X64 ]] && echo "x64" && return
136-
echo $default
137-
}
138-
139119
_kvm_requested_version_or_alias() {
140120
local versionOrAlias="$1"
141121

142122
if [ -e "$KRE_USER_HOME/alias/$versionOrAlias.alias" ]; then
143123
local kreFullName=$(cat "$KRE_USER_HOME/alias/$versionOrAlias.alias")
144124
local pkgName=$(echo $kreFullName | sed "s/\([^.]*\).*/\1/")
145125
local pkgVersion=$(echo $kreFullName | sed "s/[^.]*.\(.*\)/\1/")
146-
local pkgPlatform=$(_kvm_requested_platform $(echo "$pkgName" | sed "s/KRE-\([^-]*\).*/\1/"))
147-
local pkgArchitecture=$(_kvm_requested_architecture $(echo "$pkgName" | sed "s/.*-.*-\([^-]*\).*/\1/"))
126+
local pkgPlatform=$(echo "$pkgName" | sed "s/KRE-\([^.-]*\).*/\1/")
148127
else
149128
local pkgVersion=$versionOrAlias
150-
local pkgPlatform=$(_kvm_requested_platform "mono45")
151-
local pkgArchitecture=$(_kvm_requested_architecture "x86")
129+
local pkgPlatform="Mono"
152130
fi
153-
echo "KRE-$pkgPlatform-$pkgArchitecture.$pkgVersion"
131+
132+
echo "KRE-$pkgPlatform.$pkgVersion"
154133
}
155134

156135
# This will be more relevant if we support global installs
@@ -169,7 +148,7 @@ kvm()
169148
case $1 in
170149
"help" )
171150
echo ""
172-
echo "K Runtime Environment Version Manager - Build 10015"
151+
echo "K Runtime Environment Version Manager - Build 10017"
173152
echo ""
174153
echo "USAGE: kvm <command> [options]"
175154
echo ""
@@ -235,7 +214,7 @@ kvm()
235214
done
236215
if [[ "$versionOrAlias" == "latest" ]]; then
237216
echo "Determining latest version"
238-
versionOrAlias=$(_kvm_find_latest mono45 x86)
217+
versionOrAlias=$(_kvm_find_latest)
239218
[[ $? == 1 ]] && echo "Error: Could not find latest version from feed $KRE_FEED" && return 1
240219
echo "Latest version is $versionOrAlias"
241220
fi
@@ -251,14 +230,15 @@ kvm()
251230
mkdir "$kreFolder" > /dev/null 2>&1
252231
cp -a "$versionOrAlias" "$kreFile"
253232
_kvm_unpack "$kreFile" "$kreFolder"
233+
[[ $? == 1 ]] && return 1
254234
fi
255235
kvm use "$kreVersion" "$persistent"
256236
[[ -n $alias ]] && kvm alias "$alias" "$kreVersion"
257237
else
258238
local kreFullName="$(_kvm_requested_version_or_alias $versionOrAlias)"
259239
local kreFolder="$KRE_USER_PACKAGES/$kreFullName"
260240
_kvm_download "$kreFullName" "$kreFolder"
261-
[[ $? == 1 ]] && return
241+
[[ $? == 1 ]] && return 1
262242
kvm use "$versionOrAlias" "$persistent"
263243
[[ -n $alias ]] && kvm alias "$alias" "$versionOrAlias"
264244
fi
@@ -379,9 +359,9 @@ kvm()
379359
let i+=1
380360
done
381361

382-
local formatString="%-6s %-20s %-7s %-12s %-20s %s\n"
383-
printf "$formatString" "Active" "Version" "Runtime" "Architecture" "Location" "Alias"
384-
printf "$formatString" "------" "-------" "-------" "------------" "--------" "-----"
362+
local formatString="%-6s %-20s %-7s %-20s %s\n"
363+
printf "$formatString" "Active" "Version" "Runtime" "Location" "Alias"
364+
printf "$formatString" "------" "-------" "-------" "--------" "-----"
385365

386366
local formattedHome=`(echo $KRE_USER_PACKAGES | sed s=$HOME=~=g)`
387367
for f in $(find $KRE_USER_PACKAGES/* -name "$searchGlob" -type d -prune -exec basename {} \;); do
@@ -393,14 +373,15 @@ kvm()
393373
local alias=""
394374
local delim=""
395375
for i in "${arr[@]}"; do
396-
temp="KRE-$pkgName-x86.$pkgVersion"
397-
if [[ ${i#*/} == $temp ]]; then
376+
temp="KRE-$pkgName.$pkgVersion"
377+
temp2="KRE-$pkgName-x86.$pkgVersion"
378+
if [[ ${i#*/} == $temp || ${i#*/} == $temp2 ]]; then
398379
alias+="$delim${i%/*}"
399380
delim=", "
400381
fi
401382
done
402383

403-
printf "$formatString" "$active" "$pkgVersion" "$pkgName" "x86" "$formattedHome" "$alias"
384+
printf "$formatString" "$active" "$pkgVersion" "$pkgName" "$formattedHome" "$alias"
404385
[[ $# == 2 ]] && echo "" && return 0
405386
done
406387

0 commit comments

Comments
 (0)