diff options
| author | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-06-26 08:58:23 (GMT) |
|---|---|---|
| committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-06-26 08:58:23 (GMT) |
| commit | dc4af46efd750099c5a63fda646812611c2e9bd4 (patch) | |
| tree | d7c7b10fa578ee360cc5af36e81bad54c52b7232 | |
| parent | 325906007853b67b21adbef8f6caa93c64ba38f5 (diff) | |
Add a start-sugar command to the shel
| -rw-r--r-- | Makefile | 1 | ||||
| -rwxr-xr-x | scripts/shell/start-sugar | 6 | ||||
| -rw-r--r-- | scripts/xinitrc | 10 |
3 files changed, 15 insertions, 2 deletions
@@ -49,6 +49,7 @@ run: shell: @PS1="[sugar-build]$$ " \ PATH=$(PATH):$(SCRIPTS)/shell \ + SUGAR_BUILD_SHELL=yes \ $(JHBUILD) shell bug-report: diff --git a/scripts/shell/start-sugar b/scripts/shell/start-sugar new file mode 100755 index 0000000..86766fa --- /dev/null +++ b/scripts/shell/start-sugar @@ -0,0 +1,6 @@ +#!/bin/sh + +shelldir=`dirname "$0"` +scriptsdir=`dirname "$shelldir"` + +xinit $scriptsdir/xinitrc -- :99 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 |