lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-05-09 12:37:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do not silence standard error

Browse Source 
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>
This commit is contained in:
Dimitrios Apostolou
2019-09-09 10:45:47 +02:00
parent b8eb110c81
commit c7f87acb37
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/provisioning/common/linux/disable-ntp_linux.sh
View File

@@ -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 elif cat /etc/os-release |grep "SUSE Linux Enterprise Server 15"; then
sudo timedatectl set-ntp false sudo timedatectl set-ntp false
else else
(systemctl &>/dev/null && sudo systemctl disable ntpd) || sudo /sbin/chkconfig ntpd off sudo systemctl disable ntpd || sudo /sbin/chkconfig ntpd off
fi fi

4
coin/provisioning/common/unix/squishInstall.sh
View File

@@ -122,7 +122,7 @@ function MountAndInstall {
sudo cp $targetFileMount /tmp sudo cp $targetFileMount /tmp
UnMount UnMount
sudo hdiutil attach "/tmp/$targetFile" 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" mountFolder="/Volumes/froglogic Squish"
UnMount UnMount
elif [[ $targetFile == *.run ]]; then elif [[ $targetFile == *.run ]]; then
@@ -130,7 +130,7 @@ function MountAndInstall {
sudo cp $targetFileMount $targetDirectory sudo cp $targetFileMount $targetDirectory
UnMount UnMount
sudo chmod +x $targetDirectory/$targetFile 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" sudo rm -fr "$targetDirectory/$targetFile"
if uname -a |grep -q "Ubuntu"; then if uname -a |grep -q "Ubuntu"; then
sudo mkdir /usr/lib/tcl8.6 sudo mkdir /usr/lib/tcl8.6