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.

3 files changed, 13 insertions, 9 deletions

diff --git a/scripts/check-system b/scripts/check-system
index 659d81e..f4ff56a 100755
--- a/scripts/check-system
+++ b/scripts/check-system
@@ -281,10 +281,6 @@ checks = \
    "checker": "gtkmodule",
    "packages": { "fedora": "at-spi2-atk",
                  "ubuntu": "libatk-adaptor" } },
- { "check": "ssh-agent",
-   "checker": "binary",
-   "packages": { "fedora": "openssh-clients",
-                 "ubuntu": "openssh-client" } },
  { "check": "dbus-launch",
    "checker": "binary",
    "packages": { "fedora": "dbus-x11",
diff --git a/scripts/run-with-keyring b/scripts/run-with-keyring
new file mode 100755
index 0000000..2925d2f
--- /dev/null
+++ b/scripts/run-with-keyring
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+eval `gnome-keyring-daemon --start --components=secrets,pkcs11,ssh,gpg`
+
+export SSH_AUTH_SOCK
+export GNOME_KEYRING_CONTROL
+export GPG_AGENT_INFO
+export GNOME_KEYRING_PID
+
+exec $1
+
+kill $GNOME_KEYRING_PID
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