Merge branch 'master' of git+ssh://guillaume@dev.laptop.org/git/sugar

2007-03-08 15:50:23 +01:00 · 2007-03-08 15:50:23 +01:00 · 517bab0973
commit 517bab0973
parent 2312aa6a99 e9f3099635
1 changed files with 4 additions and 1 deletions
--- a/5
+++ b/5
@ -39,7 +39,10 @@ from sugar.emulator import Emulator
 import _sugar

 if len(sys.argv) == 1:
-    program = 'shell/sugar-shell'
+    if sourcedir:
+        program = os.path.join(sourcedir, 'shell/sugar-shell')
+    else:
+        program = 'sugar-shell'
 else:
    program = sys.argv[1]