diff options
| author | chcosta <chcosta@microsoft.com> | 2016-08-25 23:14:39 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-25 23:14:39 +0300 |
| commit | 6445e82cceae75fa07fe5123ee290579c78864d5 (patch) | |
| tree | aeb1bbedf332fc1edf781e8841fef861aeb42976 /init-tools.sh | |
| parent | e2f11fcd3e2034483b7c2c68d3260a4a6df1c1bd (diff) | |
Enable init-tools option to suppress non-error output from the console output (#11059)
* Enable option to suppress non-error output from the console output for
init-tools.
* Redirect standard output to log
* Remove unneccesary arg
* Add Linux init-tools changes
* revert dotnet to x64
* Remove echo line from run.sh
Diffstat (limited to 'init-tools.sh')
| -rwxr-xr-x | init-tools.sh | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/init-tools.sh b/init-tools.sh index c422801ecd..aa42892213 100755 --- a/init-tools.sh +++ b/init-tools.sh @@ -47,12 +47,11 @@ OSName=$(uname -s) ;; esac fi - if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then if [ -e $__TOOLRUNTIME_DIR ]; then rm -rf -- $__TOOLRUNTIME_DIR; fi echo "Running: $__scriptpath/init-tools.sh" > $__init_tools_log if [ ! -e $__DOTNET_PATH ]; then - echo "Installing dotnet cli..." + echo "Installing dotnet cli..." >> $__init_tools_log __DOTNET_LOCATION="https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.${__DOTNET_TOOLS_VERSION}.tar.gz" # curl has HTTPS CA trust-issues less often than wget, so lets try that first. echo "Installing '${__DOTNET_LOCATION}' to '$__DOTNET_PATH/dotnet.tar'" >> $__init_tools_log @@ -73,13 +72,13 @@ if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then echo $__PROJECT_JSON_CONTENTS > "$__PROJECT_JSON_FILE" if [ ! -e $__BUILD_TOOLS_PATH ]; then - echo "Restoring BuildTools version $__BUILD_TOOLS_PACKAGE_VERSION..." + echo "Restoring BuildTools version $__BUILD_TOOLS_PACKAGE_VERSION..." >> $__init_tools_log echo "Running: $__DOTNET_CMD restore \"$__PROJECT_JSON_FILE\" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE" >> $__init_tools_log $__DOTNET_CMD restore "$__PROJECT_JSON_FILE" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE >> $__init_tools_log if [ ! -e "$__BUILD_TOOLS_PATH/init-tools.sh" ]; then echo "ERROR: Could not restore build tools correctly. See '$__init_tools_log' for more details."; fi fi - echo "Initializing BuildTools..." + echo "Initializing BuildTools..." >> $__init_tools_log echo "Running: $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR" >> $__init_tools_log $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR >> $__init_tools_log if [ "$?" != "0" ]; then @@ -87,7 +86,7 @@ if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then exit 1 fi touch $__INIT_TOOLS_DONE_MARKER - echo "Done initializing tools." + echo "Done initializing tools." >> $__init_tools_log else - echo "Tools are already initialized" + echo "Tools are already initialized" > $__init_tools_log fi |