diff options
| -rw-r--r-- | README | 7 | ||||
| -rw-r--r-- | TODO | 2 | ||||
| -rwxr-xr-x | scripts/check-system | 4 | ||||
| -rwxr-xr-x | scripts/run-with-keyring | 12 | ||||
| -rw-r--r-- | scripts/xinitrc | 6 |
5 files changed, 22 insertions, 9 deletions
@@ -92,3 +92,10 @@ select one and turn off the others. By default we select the first output listed by RandR. You can set this variable to override that with any other of the connected outputs reported by xrandr command, for example VGA1 if you have an external monitor. + +PROFILE + +Sugar supports multiple profiles, so that you can run multiple +instances with the same user. You can specify the name of the +profile with this option. A random generated one is added to +the config if you are running sugar-build under sugar. @@ -1,3 +1,5 @@ * Figure out what to do with shutdown * make test and keyring * Tests unreliability +* When using sudo print the command we are going to execute +* Fully build out of source directory diff --git a/scripts/check-system b/scripts/check-system index 14168ea..0d35478 100755 --- a/scripts/check-system +++ b/scripts/check-system @@ -285,10 +285,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 |