diff options
| author | Ray Strode <rstrode@redhat.com> | 2011-06-01 10:45:04 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2011-06-01 10:50:03 -0400 |
| commit | d8d5455c617a22f79934f5351b8d8072e202e52a (patch) | |
| tree | d11f6b0f7cc4cf50dbea3d0d08b0b1a08d3e3ef3 | |
| parent | c820ecd211396c50b44d418b85c6510cad69b373 (diff) | |
| download | gdm-d8d5455c617a22f79934f5351b8d8072e202e52a.tar.gz | |
dconf: set XDG_CACHE_HOME in addition to XDG_CONFIG_HOME
If we don't set this, it will use the default which can
cause weird behavior when building in a logged in session.
(cherry picked from commit 7f6cc6b06d401cf466ed56ea8a0f849c619ab176)
| -rwxr-xr-x | data/make-dconf-override-db.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/data/make-dconf-override-db.sh b/data/make-dconf-override-db.sh index 8f4dc6d5..ca048521 100755 --- a/data/make-dconf-override-db.sh +++ b/data/make-dconf-override-db.sh @@ -2,10 +2,14 @@ set -e -export XDG_CONFIG_HOME=$(mktemp -d --tmpdir="$PWD") +export TMPDIR=$(mktemp -d --tmpdir="$PWD") +export XDG_CONFIG_HOME="$TMPDIR/config" +export XDG_CACHE_HOME="$TMPDIR/cache" +mkdir -p $XDG_CONFIG_HOME $XDG_CACHE_HOME + eval `dbus-launch --sh-syntax` -trap 'rm -rf $XDG_CONFIG_HOME; kill $DBUS_SESSION_BUS_PID' ERR +trap 'rm -rf $TMPDIR; kill $DBUS_SESSION_BUS_PID' ERR gsettings set org.gnome.power-manager show-actions false @@ -51,6 +55,6 @@ gsettings set org.gnome.settings-daemon.plugins.xrandr active true gsettings set org.gnome.settings-daemon.plugins.xsettings active true mv $XDG_CONFIG_HOME/dconf/user dconf-override-db -rm -rf $XDG_CONFIG_HOME +rm -rf $TMPDIR kill $DBUS_SESSION_BUS_PID |