Merge lp:~mterry/ubuntu-touch-session/xdg-dirs into lp:ubuntu-touch-session

[Michael Terry]

Set up XDG_*_DIRS for sessions' convenience. This makes it easier to append directories, without providing the default values.

Set up XDG_*_DIRS for sessions' convenience. This makes it easier to append directories, without providing the default values.

[Michał Sawicz (saviq)]

Works!

review: Approve

[lp:~mterry/ubuntu-touch-session/xdg-dirs]

188. By Michael Terry on 2014-06-05

Drop hard-coded ubuntu dir

[Iain Lane (laney)]

I visually compared this to /etc/X11/Xsession.d/60x11-common_xdg_path and it looks like it expresses the same thing to me. Thanks!

review: Approve

[Oliver Grawert (ogra)]

looks fine

review: Approve

=== modified file 'ubuntu-touch-session'
--- ubuntu-touch-session	2014-05-27 10:42:41 +0000
+++ ubuntu-touch-session	2014-06-05 15:26:04 +0000
@@ -24,6 +24,14 @@
     fi
 fi
 
+# Set up xdg dirs
+[ -z "$XDG_CONFIG_DIRS" ] && export XDG_CONFIG_DIRS=/etc/xdg
+[ -z "$XDG_DATA_DIRS" ] && export XDG_DATA_DIRS=/usr/local/share:/usr/share
+if [ -n "$DESKTOP_SESSION" ]; then
+    export XDG_CONFIG_DIRS=/etc/xdg/xdg-$DESKTOP_SESSION:$XDG_CONFIG_DIRS
+    export XDG_DATA_DIRS=/usr/share/$DESKTOP_SESSION:$XDG_DATA_DIRS
+fi
+
 export GRID_UNIT_PX=${GRID_UNIT_PX}
 export QTWEBKIT_DPR=${QTWEBKIT_DPR}
 export NATIVE_ORIENTATION=${NATIVE_ORIENTATION}