More cleanups and some fixes

1 files changed, 6 insertions, 0 deletions

diff --git a/shell/sugar b/shell/sugar
index 1a5d1ad..528aa19 100755
--- a/shell/sugar
+++ b/shell/sugar
@@ -5,6 +5,8 @@ import os
 import pwd
 import random
 
+from Emulator import Emulator
+
 def add_to_python_path(path):
 	sys.path.insert(0, path)
 	if os.environ.has_key('PYTHONPATH'):
@@ -13,6 +15,10 @@ def add_to_python_path(path):
 	else:
 		os.environ['PYTHONPATH'] = path
 
+# FIXE Don't run the emulator on the OLPC
+emulator = Emulator()
+emulator.start()
+
 i = 0
 for arg in sys.argv:
 	if arg == '--test-user':