diff options
| -rwxr-xr-x | shell/sugar-shell | 6 | ||||
| -rwxr-xr-x | sugar-emulator | 44 |
2 files changed, 10 insertions, 40 deletions
diff --git a/shell/sugar-shell b/shell/sugar-shell index 08a3a6d..5b85da1 100755 --- a/shell/sugar-shell +++ b/shell/sugar-shell @@ -19,6 +19,9 @@ import sys import os +if len(sys.argv) == 2: + sys.path.insert(0, sys.argv[1]) + import pygtk pygtk.require('2.0') import gtk @@ -32,7 +35,8 @@ from sugar import TracebackUtils logger.cleanup() logger.start('shell') -sys.path.insert(0, os.path.join(env.get_data_dir(), 'shell')) +if len(sys.argv) == 1: + sys.path.insert(0, os.path.join(env.get_data_dir(), 'shell')) from view.FirstTimeDialog import FirstTimeDialog from view.Shell import Shell diff --git a/sugar-emulator b/sugar-emulator index 8d6c228..7260db0 100755 --- a/sugar-emulator +++ b/sugar-emulator @@ -35,44 +35,6 @@ from sugar import env from sugar import util from sugar.emulator import Emulator -if sourcedir: - if os.environ.has_key('PYTHONPATH'): - old_path = os.environ['PYTHONPATH'] - os.environ['PYTHONPATH'] = sourcedir + ':' + old_path - else: - os.environ['PYTHONPATH'] = sourcedir - - bin_path = sourcedir - bin_path += ':' + os.path.join(sourcedir, 'shell') - bin_path += ':' + os.path.join(sourcedir, 'services/presence') - bin_path += ':' + os.path.join(sourcedir, 'services/clipboard') - - if os.environ.has_key('PATH'): - old_path = os.environ['PATH'] - os.environ['PATH'] = bin_path + ':' + old_path - else: - os.environ['PATH'] = bin_path - - bin = os.path.join(sourcedir, - 'services/presence/sugar-presence-service') - util.write_service('org.laptop.Presence', bin, - env.get_user_service_dir()) - - bin = os.path.join(sourcedir, - 'services/clipboard/sugar-clipboard') - util.write_service('org.laptop.Clipboard', bin, - env.get_user_service_dir()) - - bin = os.path.join(sourcedir, - 'services/datastore/sugar-data-store') - util.write_service('org.laptop.sugar.DataStore', bin, - env.get_user_service_dir()) - - bin = os.path.join(sourcedir, - 'services/console/sugar-console') - util.write_service('org.laptop.sugar.Console', bin, - env.get_user_service_dir()) - if len(sys.argv) == 1: program = 'sugar-shell' else: @@ -90,4 +52,8 @@ else: emulator = Emulator(width, height, fullscreen) emulator.start() -os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session', program) +if sourcedir: + program = os.path.join(os.path.join(sourcedir, 'shell'), program) + os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session', program, sourcedir) +else: + os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session', program) |