lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-20 03:46:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Provision: Remove excess export that wasn't read in Ubuntus

Browse Source 
Default shell for 'qt' user is Dash. It doesn't read .bashrc
at all. Coin uses bash, but uses it non-interactively which
in .bashrc means that it bails out immediately. So same result,
.bashrc isn't read in Ubuntus.

Change-Id: Id466c86f8cc813aacd5f41c4b267b44e93759377
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Tony Sarajärvi
2017-04-25 09:48:16 +03:00
committed by Simon Hausmann
parent c3d2bd97bf
commit fb67cd8ef0
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh
View File

@@ -44,7 +44,6 @@ ExceptionGsettings1=100
ExceptionGsettings2=101 ExceptionGsettings2=101
ExceptionGsettings3=102 ExceptionGsettings3=102
ExceptionNTS=103 ExceptionNTS=103
ExceptionDISPLAY=104
try try
( (
@@ -57,8 +56,6 @@ try
echo "Set Network Test Server address to $NTS_IP in /etc/hosts" echo "Set Network Test Server address to $NTS_IP in /etc/hosts"
echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts || throw $ExceptionNTS echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts || throw $ExceptionNTS
echo "Set DISPLAY"
echo 'export DISPLAY=":0"' >> ~/.bashrc || throw $ExceptionDISPLAY
) )
catch || { catch || {
case $ex_code in case $ex_code in
@@ -78,10 +75,6 @@ catch || {
echo "Failed to set network teset server address into /etc/hosts." echo "Failed to set network teset server address into /etc/hosts."
exit 1; exit 1;
;; ;;
$ExceptionDISPLAY)
echo "Failed to set DISPLAY into ~/.bashrc."
exit 1;
;;
esac esac
} }