Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Narvaez <dwnarvaez@gmail.com>2012-07-11 14:06:14 (GMT)
committer Daniel Narvaez <dwnarvaez@gmail.com>2012-07-11 14:06:14 (GMT)
commit0b1cc5e3bfc551ada647ea8385535f6e755ec6b8 (patch)
tree74e9039b860f09aeb8181d2a8ed64f1e7f5b4dc9 /scripts
parent7bb7f6135658870f1dc8a168743546c0c010a668 (diff)
Fix running dogtail under sugar
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/run-dogtail-tests6
-rw-r--r--scripts/xinitrc5
2 files changed, 5 insertions, 6 deletions
diff --git a/scripts/run-dogtail-tests b/scripts/run-dogtail-tests
index e588645..0994041 100755
--- a/scripts/run-dogtail-tests
+++ b/scripts/run-dogtail-tests
@@ -24,11 +24,7 @@ fi
export SUGAR_LOGGER_LEVEL=debug
export GTK_MODULES=gail:atk-bridge
-export SUGAR_PROFILE=dogtail
-
-PROFILE_PATH=~/.sugar/dogtail
-
-rm -rf $PROFILE_PATH
+export SUGAR_DOGTAIL=yes
xinit $scriptsdir/xinitrc -- $xserver &
xinitpid=$!
diff --git a/scripts/xinitrc b/scripts/xinitrc
index 71c2709..16760e3 100644
--- a/scripts/xinitrc
+++ b/scripts/xinitrc
@@ -38,7 +38,10 @@ do
fi
done
-if [ ! -z $PROFILE ]; then
+if [ ! -z $SUGAR_DOGTAIL ]; then
+ rm -rf ~/sugar/dogtail
+ export SUGAR_PROFILE=dogtail
+elif [ ! -z $PROFILE ]; then
export SUGAR_PROFILE=$PROFILE
fi