Merge branch 'master' of https://github.com/codecombat/codecombat

scripts/devSetup/bootstrap.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-repositoryUrl=https://github.com/codecombat/codecombat.git
+repositoryUrl=${1:-https://github.com/codecombat/codecombat.git}
 deps=( git python )
 function checkDependencies { #usage: checkDependencies [name of dependency array] [name of error checking function]
     declare -a dependencyArray=("${!1}")
@@ -32,6 +32,6 @@ function checkIsRoot {
 #checkIsRoot
 checkDependencies deps[@] basicDependenciesErrorHandling
 #install git repository
-git clone https://github.com/codecombat/codecombat.git coco
+git clone $repositoryUrl coco
 #python ./coco/scripts/devSetup/setup.py
 echo "Now copy and paste 'sudo python ./coco/scripts/devSetup/setup.py' into the terminal!"

scripts/devSetup/factories.py

@@ -59,8 +59,9 @@ class SetupFactory(object):
 
         print("Done! If you want to start the server, head into /coco/bin and run ")
         print("1. ./coco-mongodb")
-        print("2. ./coco-brunch")
+        print("2. ./coco-brunch ")
         print("3. ./coco-dev-server")
+        print("NOTE: brunch may need to be run as sudo if it doesn't work (ulimit needs to be set higher than default)")
         print("Once brunch is done, visit http://localhost:3000!")
     def cleanup(self):
         self.config.directory.remove_tmp_directory()

scripts/devSetup/node.py

@@ -36,6 +36,7 @@ class Node(Dependency):
         return "COCO_NODE_PATH=" + self.config.directory.bin_directory + os.sep + u"node" + os.sep + "bin" + os.sep +"node"
     def install_dependencies(self):
         install_directory = self.config.directory.bin_directory + os.sep + u"node"
+        #check for node here
         unzipped_node_path = self.findUnzippedNodePath()
         if self.config.system.operating_system in ["mac","linux"] and not which("node"):
             print "Copying node into /usr/local/bin/..."