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

Merge pull request #6065 from omajid/dotnet-install-consistency

Browse source 
Fix path printed in help for dotnet-install
This commit is contained in:
Eric Erhardt 2017-03-18 09:39:01 -05:00 • committed by GitHub
commit 1ff379a36c
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -414,7 +414,7 @@ construct_download_link() {
return 0 return 0
} }
get_user_share_path() { get_user_install_path() {
eval $invocation eval $invocation
if [ ! -z "${DOTNET_INSTALL_DIR:-}" ]; then if [ ! -z "${DOTNET_INSTALL_DIR:-}" ]; then
@ -432,9 +432,9 @@ resolve_installation_path() {
local install_dir=$1 local install_dir=$1
if [ "$install_dir" = "<auto>" ]; then if [ "$install_dir" = "<auto>" ]; then
local user_share_path=$(get_user_share_path) local user_install_path=$(get_user_install_path)
say_verbose "resolve_installation_path: share_path=$user_share_path" say_verbose "resolve_installation_path: user_install_path=$user_install_path"
echo "$user_share_path" echo "$user_install_path"
return 0 return 0
fi fi
@ -684,7 +684,7 @@ do
echo " Location is chosen in following order:" echo " Location is chosen in following order:"
echo " - --install-dir option" echo " - --install-dir option"
echo " - Environmental variable DOTNET_INSTALL_DIR" echo " - Environmental variable DOTNET_INSTALL_DIR"
echo " - /usr/local/share/dotnet" echo " - $HOME/.dotnet"
exit 0 exit 0
;; ;;
*) *)