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

Support powershell switches in bash, unify --install-dir experience

Browse source
This commit is contained in:
Krzysztof Wicher 2016-03-14 16:56:44 -07:00
parent 9360128c13
commit 54b33bc9ea
1 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

46
scripts/obtain/install.sh
View file

@ -334,8 +334,6 @@ get_user_share_path() {
if [ ! -z "${DOTNET_INSTALL_DIR:-}" ]; then if [ ! -z "${DOTNET_INSTALL_DIR:-}" ]; then
echo $DOTNET_INSTALL_DIR echo $DOTNET_INSTALL_DIR
elif [ ! -z "${PREFIX:-}" ]; then
echo $PREFIX
else else
echo "/usr/local/share/dotnet" echo "/usr/local/share/dotnet"
fi fi
@ -499,39 +497,39 @@ while [ $# -ne 0 ]
do do
name=$1 name=$1
case $name in case $name in
-c|--channel) -c|--channel|-[Cc]hannel)
shift shift
channel=$1 channel=$1
;; ;;
-v|--version) -v|--version|-[Vv]ersion)
shift shift
version="$1" version="$1"
;; ;;
-p|--prefix) -i|--install-dir|-[Ii]nstall[Dd]ir)
shift shift
install_dir="$1" install_dir="$1"
;; ;;
--arch|--architecture) --arch|--architecture|-[Aa]rch|-[Aa]rchitecture)
shift shift
architecture="$1" architecture="$1"
;; ;;
--debug-symbols) --debug-symbols|-[Dd]ebug[Ss]ymbols)
debug_symbols=true debug_symbols=true
;; ;;
--dry-run) --dry-run|-[Dd]ry[Rr]un)
dry_run=true dry_run=true
;; ;;
--no-path) --no-path|-[Nn]o[Pp]ath)
no_path=true no_path=true
;; ;;
--verbose) --verbose|-[Vv]erbose)
verbose=true verbose=true
;; ;;
--azure-feed) --azure-feed|-[Aa]zure[Ff]eed)
shift shift
azure_feed="$1" azure_feed="$1"
;; ;;
-?|--?|-h|--help) -?|--?|-h|--help|-[Hh]elp)
script_name="$(basename $0)" script_name="$(basename $0)"
echo ".NET Tools Installer" echo ".NET Tools Installer"
echo "Usage: $script_name [-c|--channel <CHANNEL>] [-v|--version <VERSION>] [-p|--prefix <DESTINATION>]" echo "Usage: $script_name [-c|--channel <CHANNEL>] [-v|--version <VERSION>] [-p|--prefix <DESTINATION>]"
@ -541,22 +539,24 @@ do
echo "" echo ""
echo "Options:" echo "Options:"
echo " -c,--channel <CHANNEL> Download from the CHANNEL specified (default: $channel)." echo " -c,--channel <CHANNEL> Download from the CHANNEL specified (default: $channel)."
echo " -Channel"
echo " -v,--version <VERSION> Use specific version, ``latest`` or ``lkg``. Defaults to ``latest``." echo " -v,--version <VERSION> Use specific version, ``latest`` or ``lkg``. Defaults to ``latest``."
echo " -p,--prefix <PREFIX> Install under specified location (see Install Location below)" echo " -Version"
echo " --arch Architecture of .NET Tools. Currently only x64 is supported." echo " -i,--install-dir <DIR> Install under specified location (see Install Location below)"
echo " -InstallDir"
echo " --architecture <ARCHITECTURE> Architecture of .NET Tools. Currently only x64 is supported." echo " --architecture <ARCHITECTURE> Architecture of .NET Tools. Currently only x64 is supported."
echo " --debug-symbols Specifies if symbols should be included in the installation." echo " --arch,-Architecture,-Arch"
echo " --dry-run Do not perform installation. Display download link." echo " --debug-symbols,-DebugSymbols Specifies if symbols should be included in the installation."
echo " --no-path Do not set PATH for the current process." echo " --dry-run,-DryRun Do not perform installation. Display download link."
echo " --verbose Display diagnostics information." echo " --no-path, -NoPath Do not set PATH for the current process."
echo " --azure-feed Azure feed location. Defaults to $azure_feed" echo " --verbose,-Verbose Display diagnostics information."
echo " -?,--?,-h,--help Shows this help message" echo " --azure-feed,-AzureFeed Azure feed location. Defaults to $azure_feed"
echo " -?,--?,-h,--help,-Help Shows this help message"
echo "" echo ""
echo "Install Location:" echo "Install Location:"
echo " Location is chosen in following order:" echo " Location is chosen in following order:"
echo " - --prefix option" echo " - --install-dir option"
echo " - Environmental variable DOTNET_INSTALL_DIR" echo " - Environmental variable DOTNET_INSTALL_DIR"
echo " - Environmental variable PREFIX"
echo " - /usr/local/share/dotnet" echo " - /usr/local/share/dotnet"
exit 0 exit 0
;; ;;
@ -573,7 +573,7 @@ check_min_reqs
calculate_vars calculate_vars
if [ "$dry_run" == true ]; then if [ "$dry_run" == true ]; then
say "Payload URL: $download_link" say "Payload URL: $download_link"
say "Repeatable invocation: .\$(basename $0) --version $specific_version --channel $channel --prefix $prefix" say "Repeatable invocation: ./$(basename $0) --version $specific_version --channel $channel --install-dir $install_dir"
else else
check_pre_reqs check_pre_reqs
install_dotnet install_dotnet