diff options
| author | dotnet-maestro <@dotnet-maestro> | 2019-05-01 23:27:36 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2019-05-02 11:20:31 +0300 |
| commit | 10b39a309b77a1c3aab983f51dd6b030bc1e5dfe (patch) | |
| tree | d1ed92079942ea686602a05fe6ddf49ba8f7f6fe /eng/common/init-tools-native.sh | |
| parent | 77ac60e951a2db91a61bd4af5fa644edeae43075 (diff) | |
Update dependencies from https://github.com/dotnet/arcade build 20190501.4
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19251.4
Diffstat (limited to 'eng/common/init-tools-native.sh')
| -rw-r--r-- | eng/common/init-tools-native.sh | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/eng/common/init-tools-native.sh b/eng/common/init-tools-native.sh index 54b70f678..fc72d1394 100644 --- a/eng/common/init-tools-native.sh +++ b/eng/common/init-tools-native.sh @@ -9,7 +9,7 @@ clean=false force=false download_retries=5 retry_wait_time_seconds=30 -global_json_file="${scriptroot}/../../global.json" +global_json_file="$(dirname "$(dirname "${scriptroot}")")/global.json" declare -A native_assets . $scriptroot/native/common-library.sh @@ -71,6 +71,7 @@ function ReadGlobalJsonNativeTools { local native_tools_list=$(echo $native_tools_section | awk -F"[{}]" '{print $2}') native_tools_list=${native_tools_list//[\" ]/} native_tools_list=${native_tools_list//,/$'\n'} + native_tools_list="$(echo -e "${native_tools_list}" | tr -d '[:space:]')" local old_IFS=$IFS while read -r line; do @@ -116,8 +117,6 @@ else installer_command+=" --clean" fi - echo "Installing $tool version $tool_version" - echo "Executing '$installer_command'" $installer_command if [[ $? != 0 ]]; then @@ -127,19 +126,16 @@ else done fi -if [[ ! -z $clean ]]; then +if [[ $clean = true ]]; then exit 0 fi if [[ -d $install_bin ]]; then echo "Native tools are available from $install_bin" - if [[ !-z BUILD_BUILDNUMBER ]]; then - echo "##vso[task.prependpath]$install_bin" - fi + echo "##vso[task.prependpath]$install_bin" else echo "Native tools install directory does not exist, installation failed" >&2 exit 1 fi exit 0 - |