diff options
| -rwxr-xr-x | coin/provisioning/common/linux/qnx_660.sh | 2 | ||||
| -rwxr-xr-x | coin/provisioning/common/macos/homebrew.sh | 11 | ||||
| -rwxr-xr-x | 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 |