From cfef857815392831dc15075c98c53041689a01a4 Mon Sep 17 00:00:00 2001
From: Dimitrios Apostolou <jimis@qt.io>
Date: Wed, 14 Aug 2019 15:52:56 +0200
Subject: Reduce noise in the provision logs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reduce verbosity in order to shorten logs and make them more readable.

In two cases we just remove the verbose flag.

In one other case we undo inlining of a huge script in the command line.
Because we run the provisioning scripts in trace mode, this caused the
script to be logged, and it was rather long and meaningless since it
comes from an external project.

Change-Id: I078ee3b3ab2db9425204375deb5815b6526a4466
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
---
 coin/provisioning/common/linux/qnx_660.sh                  |  2 +-
 coin/provisioning/common/macos/homebrew.sh                 | 11 +++++++++--
 coin/provisioning/common/macos/install-commandlinetools.sh |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/coin/provisioning/common/linux/qnx_660.sh b/coin/provisioning/common/linux/qnx_660.sh
index 2add6901..eb6fd5f0 100755
--- a/coin/provisioning/common/linux/qnx_660.sh
+++ b/coin/provisioning/common/linux/qnx_660.sh
@@ -49,7 +49,7 @@ echo "$sha1  $targetFile" | sha1sum --check
 if [ ! -d "$targetFolder" ]; then
     mkdir -p $targetFolder
 fi
-sudo tar -C $targetFolder -xvzf $targetFile
+sudo tar -C $targetFolder -xzf $targetFile
 sudo chown -R qt:users "$targetFolder"/"$folderName"
 
 # Verify that we have last file in tar
diff --git a/coin/provisioning/common/macos/homebrew.sh b/coin/provisioning/common/macos/homebrew.sh
index f7042de3..715477c0 100755
--- a/coin/provisioning/common/macos/homebrew.sh
+++ b/coin/provisioning/common/macos/homebrew.sh
@@ -1,5 +1,12 @@
 #!/usr/bin/env bash
-# Will install homebrew package manager for macOS
-/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" </dev/null
+
+
+# Will install homebrew package manager for macOS.
+#     WARNING: Requires commandlinetools
+
+# TODO audit and cache this file locally, see QTQAINFRA-3134
+curl -L -o /tmp/homebrew_install  https://raw.githubusercontent.com/Homebrew/install/master/install
+
+/usr/bin/ruby /tmp/homebrew_install  </dev/null
 
 brew update
diff --git a/coin/provisioning/common/macos/install-commandlinetools.sh b/coin/provisioning/common/macos/install-commandlinetools.sh
index 7b0ead98..b9f81534 100755
--- a/coin/provisioning/common/macos/install-commandlinetools.sh
+++ b/coin/provisioning/common/macos/install-commandlinetools.sh
@@ -50,7 +50,7 @@ function InstallCommandLineTools {
     hdiutil attach "/tmp/$packageName"
     cd "/Volumes/Command Line Developer Tools"
     echo "Installing"
-    sudo installer -verbose -pkg ./*.pkg -target /
+    sudo installer -pkg ./*.pkg -target /
     cd /
     # Let's fait for 5 second before unmounting. Sometimes resource is busy and cant be unmounted
     sleep 3
-- 
cgit v1.2.3