Merge lp:~sergiusens/ubuntu-touch-session/dash_dot_profile into lp:ubuntu-touch-session

Proposed by Sergio Schvezov
Status: Merged
Approved by: Oliver Grawert
Approved revision: 173
Merged at revision: 173
Proposed branch: lp:~sergiusens/ubuntu-touch-session/dash_dot_profile
Merge into: lp:ubuntu-touch-session
Diff against target: 19 lines (+4/-5)
1 file modified
ubuntu-touch-session (+4/-5)
To merge this branch: bzr merge lp:~sergiusens/ubuntu-touch-session/dash_dot_profile
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+214523@code.launchpad.net

Commit message

Setting needed UI variables to ~/.profile for dash to pick up.

To post a comment you must log in.
174. By Sergio Schvezov

Only adding vars to .profile, bash picks them up

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu-touch-session'
2--- ubuntu-touch-session 2014-03-28 12:23:36 +0000
3+++ ubuntu-touch-session 2014-04-07 14:41:33 +0000
4@@ -21,11 +21,10 @@
5 export NATIVE_ORIENTATION=${NATIVE_ORIENTATION}
6
7 # Save in bashrc so that adb picks them up (for autopilot's benefit)
8-bashrc=$HOME/.bashrc
9-grep -q GRID_UNIT_PX $bashrc || echo "export GRID_UNIT_PX=${GRID_UNIT_PX}" >> $bashrc
10-grep -q QTWEBKIT_DPR $bashrc || echo "export QTWEBKIT_DPR=${QTWEBKIT_DPR}" >> $bashrc
11-grep -q NATIVE_ORIENTATION $bashrc || echo "export NATIVE_ORIENTATION=${NATIVE_ORIENTATION}" >> $bashrc
12-
13+dot_profile=$HOME/.profile
14+grep -q GRID_UNIT_PX $dot_profile || echo "export GRID_UNIT_PX=${GRID_UNIT_PX}" >> $dot_profile
15+grep -q QTWEBKIT_DPR $dot_profile || echo "export QTWEBKIT_DPR=${QTWEBKIT_DPR}" >> $dot_profile
16+grep -q NATIVE_ORIENTATION $dot_profile || echo "export NATIVE_ORIENTATION=${NATIVE_ORIENTATION}" >> $dot_profile
17
18 if [ "$#" -ne 0 ]; then
19 exec $@

Subscribers

People subscribed via source and target branches