Skip to content
Snippets Groups Projects
Commit fb67cd8e authored by Tony Sarajärvi's avatar Tony Sarajärvi Committed by Simon Hausmann
Browse files

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


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: default avatarSami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: default avatarSimon Hausmann <simon.hausmann@qt.io>
parent c3d2bd97
Branches
Tags
No related merge requests found
...@@ -44,7 +44,6 @@ ExceptionGsettings1=100 ...@@ -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 ...@@ -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 || { ...@@ -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
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment