diff options
author | Marco Pesenti Gritti <mpg@redhat.com> | 2006-05-16 20:32:08 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <mpg@redhat.com> | 2006-05-16 20:32:08 (GMT) |
commit | 8162cc84680a7afdbf61cb93dc6f7d7b93e20123 (patch) | |
tree | 8720e78f85853313eeef80e475c817c0dec13609 /sugar/sugar | |
parent | 0f7dc51ac0af54b3d11b6d635785be9fe77118f9 (diff) |
Do not rely on dbus auto-activation.
Diffstat (limited to 'sugar/sugar')
-rwxr-xr-x | sugar/sugar | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/sugar/sugar b/sugar/sugar index 4c6ec88..5d42118 100755 --- a/sugar/sugar +++ b/sugar/sugar @@ -3,26 +3,18 @@ import sys import os -if len(sys.argv) == 1: - # FIXME Start a session - - # We are lucky and this - # currently behave as we want. - # The chat depends on the - # web browser, so both activities - # are spanned. But obviously we - # need something better. - - from sugar.chat import chat - chat.main() -elif sys.argv[1] == 'shell': - from sugar.shell import shell - shell.main() -elif sys.argv[1] == 'chat': - from sugar.chat import chat - chat.main() -elif sys.argv[1] == 'browser': - from sugar.browser import browser - browser.main() +basedir = os.path.dirname(os.path.dirname(__file__)) +if os.path.isfile(os.path.join(basedir, 'sugar', '__uninstalled__.py')): + if basedir == '': + print "Running sugar from current directory..." + else: + print "Running sugar from " + basedir + " ..." + sys.path.append(basedir) + os.environ['PYTHONPATH'] = basedir else: - print "Unknown activity" + print "Running the installed sugar..." + +from sugar.session import session + +session.start() + |