← Back to branch summary

~ci-train-bot/unity8-desktop-session/unity8-desktop-session-ubuntu-zesty-2228

« back to all changes in this revision

Viewing changes to data/lightdm-unity8-session

  • Committer: Bileto Bot
  • Author(s): Stephen M. Webb
  • Date: 2016-07-26 13:31:16 UTC
  • mfrom: (88.2.7 lp-1590439)
  • Revision ID: ci-train-bot@canonical.com-20160726133116-foogqjs8ucujfijb
load /etc/profile.d in Unity 8 desktop session (LP: #1590439, #1606246)

Show diffs side-by-side

added added

removed removed

Lines of Context:
data/lightdm-unity8-session
12
12
    touch $HOME/.config/ubuntu-system-settings/wizard-has-run
13
13
  fi
14
14
 
 
15
  # Set up xdg dirs
 
16
  [ -z "$XDG_CONFIG_DIRS" ] && export XDG_CONFIG_DIRS=/etc/xdg
 
17
  [ -z "$XDG_DATA_DIRS" ] && export XDG_DATA_DIRS=/usr/local/share:/usr/share
 
18
  if [ -n "$DESKTOP_SESSION" ]; then
 
19
      export XDG_CONFIG_DIRS=/etc/xdg/xdg-$DESKTOP_SESSION:$XDG_CONFIG_DIRS
 
20
      export XDG_DATA_DIRS=/usr/share/$DESKTOP_SESSION:$XDG_DATA_DIRS
 
21
  fi
 
22
 
 
23
  # Do any system-configured setup.
 
24
  for profile in "/etc/profile" "$HOME/.profile"; do
 
25
    if [ -r "$profile" ]; then
 
26
      . "$profile"
 
27
    fi
 
28
  done
 
29
 
 
30
  # work around crashes caused by appmenu-qt5
 
31
  # https://bugs.launchpad.net/appmenu-qt5/+bug/1606246
 
32
  unset QT_QPA_PLATFORMTHEME
 
33
 
15
34
  export QT_QPA_PLATFORM=ubuntumirclient
16
35
  export UNITY_INDICATOR_PROFILE=desktop
17
36
  export UBUNTU_PLATFORM_API_BACKEND=desktop_mirclient