diff options
author | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-07-18 16:54:20 (GMT) |
---|---|---|
committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-07-18 16:54:20 (GMT) |
commit | 00185eae12701527e38f27666930e4cc6b7307c7 (patch) | |
tree | a19f333b673737199cd6d6e40e4841c95f0dd609 /scripts/xinitrc | |
parent | e99dc4dcf1ae7908ee7792e36e9ac88c2224429a (diff) | |
parent | 06017e015e8e041c18dfb34ac2eabe8cc91b60e9 (diff) |
Merge branch 'master' of git.sugarlabs.org:sugar-build/sugar-build
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 |