cloning right branch

Author: rodriguez-facundo

utilities/install.py

@@ -9,16 +9,13 @@
 
 #by default clones branch (which can be passed as a parameter python install.py branch test_branch)
 #if branch doesnt exist clones the default_branch
-def clone(repository, folder, default_branch, cwdp='', recursive = False, destination_folder = None):
+def clone(repository, folder, default_branch, cwdp='', recursive = False):
     global branch
     print("Cloning "+repository)
     if recursive:
         subprocess.call(['git', 'clone', '--recursive', repository], cwd='./'+cwdp)
     else:
-        if destination_folder:
-                subprocess.call(['git', 'clone', repository, destination_folder], cwd='./'+cwdp)
-        else:
-                subprocess.call(['git', 'clone', repository], cwd='./'+cwdp)
+        subprocess.call(['git', 'clone', repository], cwd='./'+cwdp)
     checkout(folder, default_branch, cwdp)
 
 def checkout(folder, default_branch, cwdp):
@@ -52,23 +49,18 @@ def main(argv):
 clone('https://github.com/Neurosim-lab/netpyne.git','netpyne','ui')
 subprocess.call(['pip', 'install', '-e', '.'], cwd='./netpyne/')
 
-clone('https://github.com/openworm/org.geppetto.frontend.jupyter.git','org.geppetto.frontend.jupyter','development')
-subprocess.call(['npm', 'install'], cwd='./org.geppetto.frontend.jupyter/js')
-subprocess.call(['npm', 'run', 'build-dev'], cwd='./org.geppetto.frontend.jupyter/js')
-
-#subprocess.call(['git', 'submodule', 'update', '--init'], cwd='./')
-clone('https://github.com/openworm/org.geppetto.frontend.git','geppetto','development','netpyne_ui/', False, 'geppetto')
-# checkout('geppetto', 'development','org.geppetto.frontend.jupyter/src/jupyter_geppetto/')
-clone('https://github.com/MetaCell/geppetto-netpyne.git','geppetto-netpyne','development','netpyne_ui/geppetto/src/main/webapp/extensions/')
+clone('https://github.com/openworm/org.geppetto.frontend.jupyter.git','org.geppetto.frontend.jupyter','development','', True )
+checkout('geppetto', 'development','org.geppetto.frontend.jupyter/src/jupyter_geppetto/')
+clone('https://github.com/MetaCell/geppetto-netpyne.git','geppetto-netpyne','development','org.geppetto.frontend.jupyter/src/jupyter_geppetto/geppetto/src/main/webapp/extensions/')
 
 print("Enabling Geppetto NetPyNE Extension ...")
 geppetto_configuration = os.path.join(os.path.dirname(__file__), './utilities/GeppettoConfiguration.json')
-copyfile(geppetto_configuration, './netpyne_ui/geppetto/src/main/webapp/GeppettoConfiguration.json')
+copyfile(geppetto_configuration, './org.geppetto.frontend.jupyter/src/jupyter_geppetto/geppetto/src/main/webapp/GeppettoConfiguration.json')
 
 # Installing and building
 print("NPM Install and build for Geppetto Frontend  ...")
-subprocess.call(['npm', 'install'], cwd='./netpyne_ui/geppetto/src/main/webapp/')
-subprocess.call(['npm', 'run', 'build-dev-noTest'], cwd='./netpyne_ui/geppetto/src/main/webapp/')
+subprocess.call(['npm', 'install'], cwd='./org.geppetto.frontend.jupyter/src/jupyter_geppetto/geppetto/src/main/webapp/')
+subprocess.call(['npm', 'run', 'build-dev-noTest'], cwd='./org.geppetto.frontend.jupyter/src/jupyter_geppetto/geppetto/src/main/webapp/')
 
 print("Installing jupyter_geppetto python package ...")
 subprocess.call(['pip', 'install', '-e', '.'], cwd='./org.geppetto.frontend.jupyter')