summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitrios Apostolou <jimis@qt.io>2019-09-09 10:45:47 +0200
committerDimitrios Apostolou <jimis@qt.io>2019-09-26 20:12:25 +0200
commitc7f87acb3717b3b2231e9ded71e481e82a742596 (patch)
tree05b427d0c6062c17adaffc9c21df7a95aa5d70d1
parentb8eb110c81f29d24857bec3a8ed516584a8e6bef (diff)
downloadqt5-c7f87acb3717b3b2231e9ded71e481e82a742596.tar.gz
Do not silence standard error
Provisioning was failing and the logs did not provide any useful information because of the silenced squish install command. So I went through all the scripts and I re-enabled stderr logging where I found it silenced (with the exception of where it was purposeful or harmless). Change-Id: I5fa0b0ba4362970b214c150d399b6720b1780e1e Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
-rwxr-xr-xcoin/provisioning/common/linux/disable-ntp_linux.sh2
-rwxr-xr-xcoin/provisioning/common/unix/squishInstall.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/coin/provisioning/common/linux/disable-ntp_linux.sh b/coin/provisioning/common/linux/disable-ntp_linux.sh
index c509d36b..dc592553 100755
--- a/coin/provisioning/common/linux/disable-ntp_linux.sh
+++ b/coin/provisioning/common/linux/disable-ntp_linux.sh
@@ -44,5 +44,5 @@ elif cat /etc/os-release | grep "PRETTY_NAME" | grep -q "Leap 15"; then
elif cat /etc/os-release |grep "SUSE Linux Enterprise Server 15"; then
sudo timedatectl set-ntp false
else
- (systemctl &>/dev/null && sudo systemctl disable ntpd) || sudo /sbin/chkconfig ntpd off
+ sudo systemctl disable ntpd || sudo /sbin/chkconfig ntpd off
fi
diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh
index b40c1922..f1b5e6b5 100755
--- a/coin/provisioning/common/unix/squishInstall.sh
+++ b/coin/provisioning/common/unix/squishInstall.sh
@@ -122,7 +122,7 @@ function MountAndInstall {
sudo cp $targetFileMount /tmp
UnMount
sudo hdiutil attach "/tmp/$targetFile"
- sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1
+ sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null
mountFolder="/Volumes/froglogic Squish"
UnMount
elif [[ $targetFile == *.run ]]; then
@@ -130,7 +130,7 @@ function MountAndInstall {
sudo cp $targetFileMount $targetDirectory
UnMount
sudo chmod +x $targetDirectory/$targetFile
- sudo $targetDirectory/$targetFile unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1
+ sudo $targetDirectory/$targetFile unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null
sudo rm -fr "$targetDirectory/$targetFile"
if uname -a |grep -q "Ubuntu"; then
sudo mkdir /usr/lib/tcl8.6