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

Remove --linux-portable from dotnet-install.sh

Browse source 
It duplicates functionality achieved by using `--runtime-id linux-x64`.
Remove it and fix callers.

Keep the the --linux-portable flag in the  build scripts; that now calls
--runtime-id linux-x64 in the install script.
This commit is contained in:
Omair Majid 2017-03-17 20:27:02 -04:00
parent 1574349a59
commit df98363da4
2 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
run-build.sh
View file

@ -97,7 +97,7 @@ while [[ $# > 0 ]]; do
shift shift
;; ;;
--linux-portable) --linux-portable)
LINUX_PORTABLE_INSTALL_ARGS="--linux-portable" LINUX_PORTABLE_INSTALL_ARGS="--runtime-id linux-x64"
# Until we get test support for 2.0 we need to pass in the targets without test. # Until we get test support for 2.0 we need to pass in the targets without test.
CUSTOM_BUILD_ARGS="/p:Rid=\"linux-x64\" /p:OSName=\"linux\" /p:CLITargets=\"Prepare;Compile;Package;Publish\"" CUSTOM_BUILD_ARGS="/p:Rid=\"linux-x64\" /p:OSName=\"linux\" /p:CLITargets=\"Prepare;Compile;Package;Publish\""
args=( "${args[@]/$1}" ) args=( "${args[@]/$1}" )

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

@ -113,10 +113,7 @@ get_current_os_name() {
eval $invocation eval $invocation
local uname=$(uname) local uname=$(uname)
if [ "$linux_portable" = true ]; then if [ "$uname" = "Darwin" ]; then
echo "linux"
return 0
elif [ "$uname" = "Darwin" ]; then
echo "osx" echo "osx"
return 0 return 0
elif [ -n "$runtime_id" ]; then elif [ -n "$runtime_id" ]; then
@ -601,7 +598,6 @@ 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
linux_portable=false
runtime_id="" runtime_id=""
while [ $# -ne 0 ] while [ $# -ne 0 ]
@ -643,9 +639,6 @@ do
shift shift
azure_feed="$1" azure_feed="$1"
;; ;;
--linux-portable|-[Ll]inux[Pp]ortable)
linux_portable=true
;;
--runtime-id|-[Rr]untime[Ii]d) --runtime-id|-[Rr]untime[Ii]d)
shift shift
runtime_id="$1" runtime_id="$1"
@ -674,9 +667,7 @@ 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 " --linux-portable Installs the Linux portable .NET Tools instead of a distro-specific version." echo " --runtime-id Installs the .NET Tools for the given platform (use linux-x64 for portable linux)."
echo " -LinuxPortable"
echo " --runtime-id Installs the .NET Tools for the given platform (such as linux-x64)."
echo " -RuntimeId" echo " -RuntimeId"
echo " -?,--?,-h,--help,-Help Shows this help message" echo " -?,--?,-h,--help,-Help Shows this help message"
echo "" echo ""