Merge lp:~sil2100/ubuntu-touch-session/dont_touch_profile into lp:ubuntu-touch-session

Proposed by Łukasz Zemczak
Status: Merged
Approved by: Timo Jyrinki
Approved revision: 287
Merged at revision: 288
Proposed branch: lp:~sil2100/ubuntu-touch-session/dont_touch_profile
Merge into: lp:ubuntu-touch-session
Diff against target: 18 lines (+0/-8)
1 file modified
ubuntu-touch-session (+0/-8)
To merge this branch: bzr merge lp:~sil2100/ubuntu-touch-session/dont_touch_profile
Reviewer Review Type Date Requested Status
Timo Jyrinki Approve
Review via email: mp+303133@code.launchpad.net

Commit message

Do not save the ubuntu-touch-session environment to the local .profile files as this is not required (and bad practice).

Description of the change

Do not save the ubuntu-touch-session environment to the local .profile files as this is not required (and bad practice).

All tested and looking good.

To post a comment you must log in.
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

I agree it's much nicer to not hard-code things in the user .profile file.

review: Approve

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 2015-05-05 11:07:04 +0000
3+++ ubuntu-touch-session 2016-08-17 13:51:12 +0000
4@@ -46,14 +46,6 @@
5 export QTWEBKIT_DPR=${QTWEBKIT_DPR}
6 export NATIVE_ORIENTATION=${NATIVE_ORIENTATION}
7
8-# Save in bashrc so that adb picks them up (for autopilot's benefit)
9-dot_profile=$HOME/.profile
10-grep -q GRID_UNIT_PX $dot_profile || echo "export GRID_UNIT_PX=${GRID_UNIT_PX}" >> $dot_profile
11-grep -q QTWEBKIT_DPR $dot_profile || echo "export QTWEBKIT_DPR=${QTWEBKIT_DPR}" >> $dot_profile
12-grep -q NATIVE_ORIENTATION $dot_profile || echo "export NATIVE_ORIENTATION=${NATIVE_ORIENTATION}" >> $dot_profile
13-grep -q XDG_CONFIG_DIRS $dot_profile || echo "export XDG_CONFIG_DIRS=${XDG_CONFIG_DIRS}" >> $dot_profile
14-grep -q XDG_DATA_DIRS $dot_profile || echo "export XDG_DATA_DIRS=${XDG_DATA_DIRS}" >> $dot_profile
15-
16 # Make sure we're also exporting the profile.d variables
17 if [ -d /etc/profile.d ]; then
18 for i in /etc/profile.d/*.sh; do

Subscribers

People subscribed via source and target branches