From 0b1cc5e3bfc551ada647ea8385535f6e755ec6b8 Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Wed, 11 Jul 2012 14:06:14 +0000
Subject: Fix running dogtail under sugar

---
(limited to 'scripts')

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
 
--
cgit v0.9.1