From dc4af46efd750099c5a63fda646812611c2e9bd4 Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Tue, 26 Jun 2012 08:58:23 +0000
Subject: Add a start-sugar command to the shel

---
(limited to 'scripts/xinitrc')

diff --git a/scripts/xinitrc b/scripts/xinitrc
index 20a2276..2a7404a 100644
--- a/scripts/xinitrc
+++ b/scripts/xinitrc
@@ -1,4 +1,4 @@
-unset  GPG_AGENT_INFO
+unset GPG_AGENT_INFO
 unset SSH_AUTH_SOCK
 unset GNOME_KEYRING_CONTROL
 unset GNOME_KEYRING_PID
@@ -23,5 +23,11 @@ do
    fi
 done
 
+JHBUILD="$ROOT_DIR/build/bin/jhbuild -f $ROOT_DIR/scripts/jhbuildrc"
 RUN_COMMAND="dbus-launch --exit-with-session sugar"
-$ROOT_DIR/build/bin/jhbuild -f $ROOT_DIR/scripts/jhbuildrc run $RUN_COMMAND
+
+if [ -z $SUGAR_BUILD_SHELL ]; then
+    $JHBUILD run $RUN_COMMAND
+else
+    $RUN_COMMAND
+fi
--
cgit v0.9.1