Change the command line argument per PR comments
This commit is contained in:
parent
18169e1c6a
commit
e21c1a4a98
1 changed files with 7 additions and 7 deletions
14
scripts/obtain/dotnet-install.sh
vendored
14
scripts/obtain/dotnet-install.sh
vendored
|
@ -60,8 +60,8 @@ get_current_os_name() {
|
||||||
eval $invocation
|
eval $invocation
|
||||||
|
|
||||||
local uname=$(uname)
|
local uname=$(uname)
|
||||||
if [ ! -z "$osname_override" ]; then
|
if [ "$linux_portable" = true ]; then
|
||||||
echo "$osname_override"
|
echo "linux"
|
||||||
return 0
|
return 0
|
||||||
elif [ "$uname" = "Darwin" ]; then
|
elif [ "$uname" = "Darwin" ]; then
|
||||||
echo "osx"
|
echo "osx"
|
||||||
|
@ -587,7 +587,7 @@ azure_feed="https://dotnetcli.azureedge.net/dotnet"
|
||||||
uncached_feed="https://dotnetcli.blob.core.windows.net/dotnet"
|
uncached_feed="https://dotnetcli.blob.core.windows.net/dotnet"
|
||||||
verbose=false
|
verbose=false
|
||||||
shared_runtime=false
|
shared_runtime=false
|
||||||
osname_override=
|
linux_portable=false
|
||||||
|
|
||||||
while [ $# -ne 0 ]
|
while [ $# -ne 0 ]
|
||||||
do
|
do
|
||||||
|
@ -628,9 +628,8 @@ do
|
||||||
shift
|
shift
|
||||||
azure_feed="$1"
|
azure_feed="$1"
|
||||||
;;
|
;;
|
||||||
--osname)
|
--linux-portable|-[Ll]inux[Pp]ortable)
|
||||||
shift
|
linux_portable=true
|
||||||
osname_override="$1"
|
|
||||||
;;
|
;;
|
||||||
-?|--?|-h|--help|-[Hh]elp)
|
-?|--?|-h|--help|-[Hh]elp)
|
||||||
script_name="$(basename $0)"
|
script_name="$(basename $0)"
|
||||||
|
@ -656,7 +655,8 @@ do
|
||||||
echo " --no-path, -NoPath Do not set PATH for the current process."
|
echo " --no-path, -NoPath Do not set PATH for the current process."
|
||||||
echo " --verbose,-Verbose Display diagnostics information."
|
echo " --verbose,-Verbose Display diagnostics information."
|
||||||
echo " --azure-feed,-AzureFeed Azure feed location. Defaults to $azure_feed"
|
echo " --azure-feed,-AzureFeed Azure feed location. Defaults to $azure_feed"
|
||||||
echo " --osname Specific OS name to use. Defaults to being computed"
|
echo " --linux-portable Installs the Linux portable shared runtime instead of the shared runtime for OS."
|
||||||
|
echo " -LinuxPortable"
|
||||||
echo " -?,--?,-h,--help,-Help Shows this help message"
|
echo " -?,--?,-h,--help,-Help Shows this help message"
|
||||||
echo ""
|
echo ""
|
||||||
echo "Install Location:"
|
echo "Install Location:"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue