diff options
author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-07-12 20:17:57 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-07-12 20:17:57 (GMT) |
commit | 2bbedf988b39c5af35777954444ba54ceba13ecb (patch) | |
tree | f3607f074de03e6774a9e8963d485ea4db7dcc1c /shell/sugar | |
parent | d12b780074b05b0abcaf6b3877a9a4047c6e0d0e (diff) |
Fix a bunch of bugs, more cleanups
Diffstat (limited to 'shell/sugar')
-rwxr-xr-x | shell/sugar | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/shell/sugar b/shell/sugar index 528aa19..756fe26 100755 --- a/shell/sugar +++ b/shell/sugar @@ -5,8 +5,6 @@ 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'): @@ -15,10 +13,6 @@ 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': @@ -46,8 +40,14 @@ else: import sugar.env add_to_python_path(os.path.join(sugar.env.get_data_dir(), 'shell')) print 'Running the installed sugar...' + +from Emulator import Emulator + +# FIXE Don't run the emulator on the OLPC +emulator = Emulator() +emulator.start() -print 'Redirecting output to the console, press Ctrl+Down to open it.' +print 'Redirecting output to the console, press F3 to open it.' from Session import Session |