Big refactoring by David Farning.

1 files changed, 8 insertions, 4 deletions

diff --git a/sugar-jhbuild b/sugar-jhbuild
index f185923..fc2baac 100755
--- a/sugar-jhbuild
+++ b/sugar-jhbuild
@@ -5,9 +5,11 @@ import sys
 import subprocess
 
 base_dir = os.path.abspath(os.path.dirname(__file__))
-jhbuild_dir = os.path.join(base_dir, 'jhbuild')
 
-sys.path.append(os.path.join(base_dir, 'scripts'))
+sjhbuild_dir = os.path.join(base_dir, 'sjhbuild')
+sys.path.append(sjhbuild_dir)
+
+jhbuild_dir = os.path.join(base_dir, 'jhbuild')
 sys.path.append(jhbuild_dir)
 
 args = sys.argv[1:]
@@ -23,6 +25,8 @@ if os.path.exists(jhbuild_dir):
         cwd = os.getcwd()
         os.chdir(jhbuild_dir)
 
+        print 'Updating jhbuild...'
+
         retcode = subprocess.call(['git', 'pull'])
         if retcode:
             print 'Failed to update jhbuild.'
@@ -32,7 +36,7 @@ else:
     cwd = os.getcwd()
     os.chdir(base_dir)
 
-    jhbuild_repo = 'git://dev.laptop.org/users/marco/jhbuild'
+    jhbuild_repo = 'git://git.gnome.org/jhbuild'
     retcode = subprocess.call(['git', 'clone', jhbuild_repo])
     if retcode:
         print 'Failed to clone sugar-jhbuild.'
@@ -41,4 +45,4 @@ else:
 
 import main
 
-sys.exit(main.main(sys.argv[1:]))
+sys.exit(main.main(base_dir, sys.argv[1:]))