mirror of
git://code.qt.io/qt/qt5.git
synced 2026-03-23 14:51:24 +08:00
Reduce noise in the provision logs
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>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user