diff options
| author | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-08-07 11:40:38 (GMT) |
|---|---|---|
| committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-08-07 11:40:38 (GMT) |
| commit | f4324ad8bff1e1fb6594d599c5aa8b2149621cd2 (patch) | |
| tree | a1a5779aed2285a785eae75572ac6ddd971d05f3 /scripts | |
| parent | e7a33e537d1ea5432cdc17aadfb07f33efd7037f (diff) | |
| parent | 82a3c0e889de4974e49bdf5ce8f950ebcfdb201b (diff) | |
Merge branch 'master' of git.sugarlabs.org:sugar-build/sugar-build
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/check-system | 4 | ||||
| -rwxr-xr-x | scripts/shell/start-sugar | 21 | ||||
| -rw-r--r-- | scripts/xinitrc | 13 |
3 files changed, 30 insertions, 8 deletions
diff --git a/scripts/check-system b/scripts/check-system index 6dcad8e..e7df307 100755 --- a/scripts/check-system +++ b/scripts/check-system @@ -293,6 +293,10 @@ checks = \ "checker": "gtkmodule", "packages": { "fedora": "at-spi2-atk", "ubuntu": "libatk-adaptor" } }, + { "check": "Xephyr", + "checker": "binary", + "packages": { "fedora": "xorg-x11-server-Xephyr", + "ubuntu": "xserver-xephyr" } }, { "check": "dbus-launch", "checker": "binary", "packages": { "fedora": "dbus-x11", diff --git a/scripts/shell/start-sugar b/scripts/shell/start-sugar index 0bb1b5c..5408a43 100755 --- a/scripts/shell/start-sugar +++ b/scripts/shell/start-sugar @@ -1,7 +1,24 @@ -#!/bin/sh +#!/bin/bash shelldir=`dirname "$0"` scriptsdir=`dirname "$shelldir"` +rootdir=`dirname "$scriptsdir"` display=`$scriptsdir/find-free-display` -xinit $scriptsdir/xinitrc -- $display +if [ -f $rootdir/config ]; then + source $rootdir/config +fi + +if [ ! -z $SUGAR_PROFILE ]; then + grep -q PROFILE $rootdir/config + if [ $? -eq 1 ]; then + randomstring=`</dev/urandom tr -cd A-Za-z0-9 | head -c10` + echo "PROFILE=$randomstring" >> $ROOT_DIR/config + fi +fi + +if [ -z $RUN_IN_WINDOW ]; then + xinit $scriptsdir/xinitrc -- $display +else + xinit $scriptsdir/xinitrc -- /usr/bin/Xephyr $display +fi diff --git a/scripts/xinitrc b/scripts/xinitrc index 6c733d5..fc0b266 100644 --- a/scripts/xinitrc +++ b/scripts/xinitrc @@ -7,10 +7,6 @@ unset SESSION_MANAGER SCRIPTS_DIR=`dirname "$0"` ROOT_DIR=`dirname "$SCRIPTS_DIR"` -if [ ! -f $ROOT_DIR/config ]; then - touch $ROOT_DIR/config -fi - if [ ! -z $SUGAR_PROFILE ]; then grep -q PROFILE $ROOT_DIR/config if [ $? -eq 1 ]; then @@ -19,7 +15,9 @@ if [ ! -z $SUGAR_PROFILE ]; then fi fi -source $ROOT_DIR/config +if [ -f $ROOT_DIR/config ]; then + source $ROOT_DIR/config +fi # Sugar doesn't handle multiple outputs properly. To avoid issues we keep the # first output in the list returned by xrandr and turn off everything else. @@ -38,7 +36,10 @@ do fi done -echo $SUGAR_DOGTAIL +if [ ! -z $RESOLUTION ]; then + xrandr -s $RESOLUTION +fi + if [ ! -z $SUGAR_DOGTAIL ]; then rm -rf ~/.sugar/dogtail export SUGAR_PROFILE=dogtail |