mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #2876 from krwq/install_script_default_install_dir

Browse source 
fix default INSTALL_DIR & --dry-run issue in dotnet-install.sh
This commit is contained in:
Krzysztof Wicher 2016-05-04 15:06:24 -07:00
commit f0018642a9
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/cli-installation-scenarios.md
View file

@ -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.

4
scripts/obtain/dotnet-install.sh vendored
View file

@ -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

4
scripts/obtain/install.sh
View file

@ -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