From b18df1c51cfbfcbe4a27deb48b577737c9800751 Mon Sep 17 00:00:00 2001 From: Krzysztof Wicher Date: Wed, 4 May 2016 11:55:06 -0700 Subject: [PATCH] fix default INSTALL_DIR issue in dotnet-install.sh --- Documentation/cli-installation-scenarios.md | 2 +- scripts/obtain/dotnet-install.sh | 4 ++-- scripts/obtain/install.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/cli-installation-scenarios.md b/Documentation/cli-installation-scenarios.md index 85f547741..44827bdb2 100644 --- a/Documentation/cli-installation-scenarios.md +++ b/Documentation/cli-installation-scenarios.md @@ -213,7 +213,7 @@ The following arguments are needed for the installation script: | --version | -Version | global.json or Latest | Which version of CLI to install; you need to specify the version as 3-part version (i.e. 1.0.0-13232). If omitted, it will default to the first global.json that contains the sdkVersion property; if that is not present it will use Latest. | | --install-dir | -InstallDir | .dotnet | Path to where to install the CLI bundle. The directory is created if it doesn't exist. On Linux/OSX this directory is created in the user home directory (`$HOME`). On Windows, this directory is created in `%LocalAppData%`. | | --debug | -Debug | false | Whether to use the "fat" packages that contain debugging symbols or not. | -| --no-path | -NoPath | false | Export the prefix/installdir to the path for the current session. This makes CLI tools available immidiately after install. | +| --no-path | -NoPath | false | Do not export the installdir to the path for the current session. This makes CLI tools available immediately after install. | | --shared-runtime | -SharedRuntime | false | Install just the shared runtime bits, not the entire SDK. | Note: Powershell arg naming convention is supported on Windows and non-Windows platforms. Non-Windows platforms do additionally support convention specific to their platform. diff --git a/scripts/obtain/dotnet-install.sh b/scripts/obtain/dotnet-install.sh index 1395b12c1..b952261ff 100755 --- a/scripts/obtain/dotnet-install.sh +++ b/scripts/obtain/dotnet-install.sh @@ -358,7 +358,7 @@ get_user_share_path() { if [ ! -z "${DOTNET_INSTALL_DIR:-}" ]; then echo $DOTNET_INSTALL_DIR else - echo "/usr/local/share/dotnet" + echo "$HOME/.dotnet" fi return 0 } @@ -619,7 +619,7 @@ calculate_vars if [ "$dry_run" = true ]; then say "Payload URL: $download_link" say "Repeatable invocation: ./$(basename $0) --version $specific_version --channel $channel --install-dir $install_dir" - return 0 + exit 0 fi check_pre_reqs diff --git a/scripts/obtain/install.sh b/scripts/obtain/install.sh index 16cc30c1a..cc8a832e6 100755 --- a/scripts/obtain/install.sh +++ b/scripts/obtain/install.sh @@ -358,7 +358,7 @@ get_user_share_path() { if [ ! -z "${DOTNET_INSTALL_DIR:-}" ]; then echo $DOTNET_INSTALL_DIR else - echo "/usr/local/share/dotnet" + echo "$HOME/.dotnet" fi return 0 } @@ -619,7 +619,7 @@ calculate_vars if [ "$dry_run" = true ]; then say "Payload URL: $download_link" say "Repeatable invocation: ./$(basename $0) --version $specific_version --channel $channel --install-dir $install_dir" - return 0 + exit 0 fi check_pre_reqs