diff options
| author | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-07-16 12:47:10 (GMT) |
|---|---|---|
| committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-07-16 12:55:37 (GMT) |
| commit | 06017e015e8e041c18dfb34ac2eabe8cc91b60e9 (patch) | |
| tree | 73f6aa49f740e6d80d0de12c675427dfaaae5964 /scripts/xinitrc | |
| parent | b06bae71170fb9989e4171344234aaaf33dfc900 (diff) | |
Setup gnome keyring
I'm not sure if sugar should do this but it's certainly handy for
development and dogfooding. Most importantly it avoids leaking
keyring daemons and breaking the buildbot.
Diffstat (limited to 'scripts/xinitrc')
| -rw-r--r-- | scripts/xinitrc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/scripts/xinitrc b/scripts/xinitrc index 14f5b1f..6c733d5 100644 --- a/scripts/xinitrc +++ b/scripts/xinitrc @@ -46,15 +46,11 @@ elif [ ! -z $PROFILE ]; then export SUGAR_PROFILE=$PROFILE fi -eval `ssh-agent -s` - JHBUILD="$ROOT_DIR/install/bin/jhbuild -f $ROOT_DIR/scripts/jhbuildrc" -RUN_COMMAND="dbus-launch --exit-with-session sugar" +RUN_COMMAND="dbus-launch --exit-with-session $SCRIPTS_DIR/run-with-keyring sugar" if [ -z $SUGAR_BUILD_SHELL ]; then $JHBUILD run $RUN_COMMAND else $RUN_COMMAND fi - -kill $SSH_AGENT_PID |