From fb67cd8ef0b6a0efa4c48a6855f7d27edd98b4bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 25 Apr 2017 09:48:16 +0300 Subject: [PATCH] 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: Sami Nurmenniemi Reviewed-by: Simon Hausmann --- .../qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh index 1881ae0b..2498e441 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh @@ -44,7 +44,6 @@ ExceptionGsettings1=100 ExceptionGsettings2=101 ExceptionGsettings3=102 ExceptionNTS=103 -ExceptionDISPLAY=104 try ( @@ -57,8 +56,6 @@ try 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 "Set DISPLAY" - echo 'export DISPLAY=":0"' >> ~/.bashrc || throw $ExceptionDISPLAY ) catch || { case $ex_code in @@ -78,10 +75,6 @@ catch || { echo "Failed to set network teset server address into /etc/hosts." exit 1; ;; - $ExceptionDISPLAY) - echo "Failed to set DISPLAY into ~/.bashrc." - exit 1; - ;; esac }