[dnvm.sh] react to removal of k and rename of kpm to dnu

Author: analogrelay

test/sh/common.sh

@@ -11,8 +11,7 @@ _DNVM_VERSION_MANAGER_NAME=".NET Version Manager"
 _DNVM_DEFAULT_FEED="https://www.myget.org/F/aspnetvnext/api/v2"
 _DNVM_HOME_VAR_NAME="DNX_HOME"
 
-_DNVM_RUNTIME_EXEC_NAME="k"
-_DNVM_PACKAGE_MANAGER_NAME="kpm"
+_DNVM_PACKAGE_MANAGER_NAME="dnu"
 _DNVM_RUNTIME_HOST_NAME="dnx"
 
 if [ "$NO_COLOR" != "1" ]; then

test/sh/run-tests.sh

@@ -20,14 +20,14 @@ source $COMMON_HELPERS
 [ -z "$TEST_SHELLS" ]       && export TEST_SHELLS="bash zsh"
 [ -z "$TEST_DIR" ]          && export TEST_DIR="$SCRIPT_DIR/tests"
 [ -z "$CHESTER" ]           && export CHESTER="$SCRIPT_DIR/chester"
-[ -z "$DNX_FEED" ]          && export DNX_FEED="https://www.myget.org/F/aspnetvnext/api/v2" # doesn't really matter what the feed is, just that it is a feed
+[ -z "$DNX_FEED" ]          && export DNX_FEED="https://www.myget.org/F/aspnetrelease/api/v2" # doesn't really matter what the feed is, just that it is a feed
 [ -z "$TEST_APPS_DIR" ]     && export TEST_APPS_DIR="$REPO_ROOT/test/apps"
 
 export DNX_FEED
 
 # This is a DNX to use for testing various commands. It doesn't matter what version it is
-[ -z "$_TEST_VERSION" ]     && export _TEST_VERSION="1.0.0-beta4-11244"
-[ -z "$_NUPKG_HASH" ]       && export _NUPKG_HASH='777a1278ce10bf472a6e76629f9387129699c9e1'
+[ -z "$_TEST_VERSION" ]     && export _TEST_VERSION="1.0.0-beta4-11390"
+[ -z "$_NUPKG_HASH" ]       && export _NUPKG_HASH='12511fd555595c00a0ab681bb2cf021622923268'
 [ -z "$_NUPKG_URL" ]        && export _NUPKG_URL="$DNX_FEED/package/$_DNVM_RUNTIME_PACKAGE_NAME-mono/$_TEST_VERSION"
 [ -z "$_NUPKG_NAME" ]       && export _NUPKG_NAME="$_DNVM_RUNTIME_PACKAGE_NAME-mono.$_TEST_VERSION"
 [ -z "$_NUPKG_FILE" ]       && export _NUPKG_FILE="$TEST_WORK_DIR/${_NUPKG_NAME}.nupkg"

test/sh/tests/alias/Aliases can be use-d.sh

@@ -12,9 +12,6 @@ $_DNVM_COMMAND_NAME use test_alias_use
 
 # Check that the path now has that Runtime on it
 EXPECTED_ROOT="$DNX_USER_HOME/runtimes/$_DNVM_RUNTIME_PACKAGE_NAME-mono.$_TEST_VERSION/bin"
-echo "Expect runtime at $EXPECTED_ROOT"
-echo "Actual at $(path_of $_DNVM_RUNTIME_EXEC_NAME)"
-[ "$(path_of $_DNVM_RUNTIME_EXEC_NAME)" = "$EXPECTED_ROOT/$_DNVM_RUNTIME_EXEC_NAME" ] || die "'$_DNVM_RUNTIME_EXEC_NAME' was not available at the expected path!"
 [ "$(path_of $_DNVM_RUNTIME_HOST_NAME)" = "$EXPECTED_ROOT/$_DNVM_RUNTIME_HOST_NAME" ] || die "'$_DNVM_RUNTIME_HOST_NAME' was not available at the expected path!"
 [ "$(path_of $_DNVM_PACKAGE_MANAGER_NAME)" = "$EXPECTED_ROOT/$_DNVM_PACKAGE_MANAGER_NAME" ] || die "'$_DNVM_PACKAGE_MANAGER_NAME' was not available at the expected path!"
 

test/sh/tests/install/.Installed runtime can run hello app.sh.swp

@@ -7,11 +7,11 @@ source $_DNVM_PATH
 $_DNVM_COMMAND_NAME install latest
 
 # Test the runtime
-has $_DNVM_RUNTIME_EXEC_NAME || die "$_DNVM_RUNTIME_EXEC_NAME didn't install the runtime :("
+has $_DNVM_RUNTIME_HOST_NAME || die "didn't install the runtime :("
 has $_DNVM_PACKAGE_MANAGER_NAME || die "installed runtime didn't have a package manager?"
 
 pushd "$TEST_APPS_DIR/TestApp"
 $_DNVM_PACKAGE_MANAGER_NAME restore || die "failed to restore packages"
-OUTPUT=$($_DNVM_RUNTIME_EXEC_NAME run || die "failed to run hello application")
+OUTPUT=$($_DNVM_RUNTIME_HOST_NAME . run || die "failed to run hello application")
 echo $OUTPUT | grep 'Runtime is sane!' || die "unexpected output from sample app: $OUTPUT"
 popd

test/sh/tests/install/Installed runtime can run hello app.sh

@@ -7,7 +7,6 @@ $_DNVM_COMMAND_NAME install $_NUPKG_FILE
 [ -d "$DNX_USER_HOME/runtimes/$_NUPKG_NAME" ] || die "unable to find installed runtime"
 
 pushd "$DNX_USER_HOME/runtimes/$_NUPKG_NAME" 2>/dev/null 1>/dev/null
-[ -f bin/$_DNVM_RUNTIME_EXEC_NAME ] || die "$_DNVM_COMMAND_NAME did not include '$_DNVM_RUNTIME_EXEC_NAME' command!"
 [ -f bin/$_DNVM_RUNTIME_HOST_NAME ] || die "$_DNVM_COMMAND_NAME did not include '$_DNVM_RUNTIME_HOST_NAME' command!"
 [ -f bin/$_DNVM_PACKAGE_MANAGER_NAME ] || die "$_DNVM_COMMAND_NAME did not include '$_DNVM_PACKAGE_MANAGER_NAME' command!"
 popd 2>/dev/null 1>/dev/null

test/sh/tests/install/Installing from nupkg unpacks nupkg as expected.sh

@@ -6,7 +6,6 @@ $_DNVM_COMMAND_NAME install $_TEST_VERSION
 # Resolve the name of the runtime directory
 RUNTIME_PATH="$DNX_USER_HOME/runtimes/$_DNVM_RUNTIME_PACKAGE_NAME-mono.$_TEST_VERSION"
 
-[ -f "$RUNTIME_PATH/bin/$_DNVM_RUNTIME_EXEC_NAME" ] || die "$_DNVM_COMMAND_NAME did not include '$_DNVM_RUNTIME_EXEC_NAME' command!"
 [ -f "$RUNTIME_PATH/bin/$_DNVM_RUNTIME_HOST_NAME" ] || die "$_DNVM_COMMAND_NAME did not include '$_DNVM_RUNTIME_HOST_NAME' command!"
 [ -f "$RUNTIME_PATH/bin/$_DNVM_PACKAGE_MANAGER_NAME" ] || die "$_DNVM_COMMAND_NAME did not include '$_DNVM_PACKAGE_MANAGER_NAME' command!"
 

test/sh/tests/install/Installing latest with no arguments installs Mono CLR.sh

@@ -5,6 +5,5 @@ $_DNVM_COMMAND_NAME install "$_TEST_VERSION"
 
 EXPECTED_ROOT="$DNX_USER_HOME/runtimes/$_DNVM_RUNTIME_PACKAGE_NAME-mono.$_TEST_VERSION/bin"
 
-[ $(path_of $_DNVM_RUNTIME_EXEC_NAME) = "$EXPECTED_ROOT/$_DNVM_RUNTIME_EXEC_NAME" ] || die "'$_DNVM_RUNTIME_EXEC_NAME' was not available at the expected path!"
 [ $(path_of $_DNVM_RUNTIME_HOST_NAME) = "$EXPECTED_ROOT/$_DNVM_RUNTIME_HOST_NAME" ] || die "'$_DNVM_RUNTIME_HOST_NAME' was not available at the expected path!"
 [ $(path_of $_DNVM_PACKAGE_MANAGER_NAME) = "$EXPECTED_ROOT/$_DNVM_PACKAGE_MANAGER_NAME" ] || die "'$_DNVM_PACKAGE_MANAGER_NAME' was not available at the expected path!"

test/sh/tests/install/Installing puts selected runtime on PATH.sh

@@ -10,6 +10,5 @@ $_DNVM_COMMAND_NAME use "$_TEST_VERSION"
 # Check paths
 EXPECTED_ROOT="$DNX_USER_HOME/runtimes/$_DNVM_RUNTIME_PACKAGE_NAME-mono.$_TEST_VERSION/bin"
 
-[ "$(path_of $_DNVM_RUNTIME_EXEC_NAME)" = "$EXPECTED_ROOT/$_DNVM_RUNTIME_EXEC_NAME" ] || die "'$_DNVM_RUNTIME_EXEC_NAME' was not available at the specified path!"
 [ "$(path_of $_DNVM_RUNTIME_HOST_NAME)" = "$EXPECTED_ROOT/$_DNVM_RUNTIME_HOST_NAME" ] || die "'$_DNVM_RUNTIME_HOST_NAME' was not available at the specified path!"
 [ "$(path_of $_DNVM_PACKAGE_MANAGER_NAME)" = "$EXPECTED_ROOT/$_DNVM_PACKAGE_MANAGER_NAME" ] || die "'$_DNVM_PACKAGE_MANAGER_NAME' was not available at the specified path!"

test/sh/tests/use/Use-ing a version puts the matching runtime on the PATH.sh

@@ -10,6 +10,5 @@ $_DNVM_COMMAND_NAME use default
 # Check paths
 EXPECTED_ROOT="$DNX_USER_HOME/runtimes/$_DNVM_RUNTIME_PACKAGE_NAME-mono.$_TEST_VERSION/bin"
 
-[ "$(path_of $_DNVM_RUNTIME_EXEC_NAME)" = "$EXPECTED_ROOT/$_DNVM_RUNTIME_EXEC_NAME" ] || die "'$_DNVM_RUNTIME_EXEC_NAME' was not available at the specified path!"
 [ "$(path_of $_DNVM_RUNTIME_HOST_NAME)" = "$EXPECTED_ROOT/$_DNVM_RUNTIME_HOST_NAME" ] || die "'$_DNVM_RUNTIME_HOST_NAME' was not available at the specified path!"
 [ "$(path_of $_DNVM_PACKAGE_MANAGER_NAME)" = "$EXPECTED_ROOT/$_DNVM_PACKAGE_MANAGER_NAME" ] || die "'$_DNVM_PACKAGE_MANAGER_NAME' was not available at the specified path!"