Merge lp:~ted/ubuntu-touch-session/xdg-to-profiles into lp:ubuntu-touch-session

[Ted Gould]

Export XDG_DATA_DIRS and XDG_CONFIG_DIRS for the adb shell

Not a beautiful solution but works. When the other variables are moved out of .profile these should be as well. Didn't want to invent something for that today, just making it simple and align with what else is being done.

[Ted Gould (ted)]

Oh, also reordered slightly so all the XDG stuff was together and all the export code was together. Increases readability a bit.

[Ricardo Salveti (rsalveti)]

Yeah, looks fine, and fair to add it together with the other 'hacks'. We need to clean this all up together at some point.

review: Approve

[Oliver Grawert (ogra)]

As i said on IRC before you started working on this i would really really have preferred if you instead had put a file into XDG_RUNTIME_DIR and source it then from an /etc/profile.d snippet (like the upstart session and dbus variables do) ... the way you implemented this we will never ever be able to update the values should they change.

=== modified file 'ubuntu-touch-session'
--- ubuntu-touch-session	2014-06-25 22:45:27 +0000
+++ ubuntu-touch-session	2014-10-07 19:05:42 +0000
@@ -37,6 +37,11 @@
     export XDG_DATA_DIRS=/usr/share/$DESKTOP_SESSION:$XDG_DATA_DIRS
 fi
 
+# if /custom/xdg/config exists, add it to xdg_config_dirs. this is so upstart can get job definitions from /custom
+if [ -d /custom/xdg/config ]; then
+	export XDG_CONFIG_DIRS=/custom/xdg/config:$XDG_CONFIG_DIRS
+fi
+
 export GRID_UNIT_PX=${GRID_UNIT_PX}
 export QTWEBKIT_DPR=${QTWEBKIT_DPR}
 export NATIVE_ORIENTATION=${NATIVE_ORIENTATION}
@@ -46,11 +51,8 @@
 grep -q GRID_UNIT_PX $dot_profile || echo "export GRID_UNIT_PX=${GRID_UNIT_PX}" >> $dot_profile
 grep -q QTWEBKIT_DPR $dot_profile || echo "export QTWEBKIT_DPR=${QTWEBKIT_DPR}" >> $dot_profile
 grep -q NATIVE_ORIENTATION $dot_profile || echo "export NATIVE_ORIENTATION=${NATIVE_ORIENTATION}" >> $dot_profile
-
-# if /custom/xdg/config exists, add it to xdg_config_dirs. this is so upstart can get job definitions from /custom
-if [ -d /custom/xdg/config ]; then
-	export XDG_CONFIG_DIRS=/custom/xdg/config:$XDG_CONFIG_DIRS
-fi
+grep -q XDG_CONFIG_DIRS $dot_profile || echo "export XDG_CONFIG_DIRS=${XDG_CONFIG_DIRS}" >> $dot_profile
+grep -q XDG_DATA_DIRS $dot_profile || echo "export XDG_DATA_DIRS=${XDG_DATA_DIRS}" >> $dot_profile
 
 if [ "$#" -ne 0 ]; then
     exec $@