Cleanup some of the env creation

JeffreySu · May 2, 2013 · a16fa6f · a16fa6f
1 parent 4c86c5d
commit a16fa6f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/manage.py b/manage.py
@@ -29,10 +29,10 @@ def command_env():
 
     if not os.path.isdir(ENV):
         if TURBULENZOS == 'win32':
-            sh('%s -m virtualenv -v --no-site-packages %s' % (sys.executable, ENV))
+            sh('%s -m virtualenv --no-site-packages %s' % (sys.executable, ENV))
         else:
             print "PYTHON: %s" % PYTHON
-            cmd = 'virtualenv -v -p %s --no-site-packages %s' % (PYTHON, ENV)
+            cmd = 'virtualenv -p %s --no-site-packages %s' % (PYTHON, ENV)
             print "CMD: %s" % cmd
             sh(cmd, console=True)
 

diff --git a/scripts/install_nodejs.py b/scripts/install_nodejs.py
@@ -42,7 +42,7 @@ def nodejs_get_version(allow_system_node):
         elif PLATFORM == 'win32':
             return str(check_output('env\\Scripts\\node --version', shell=True)).rstrip()
         else:
-            return str(check_output('env/bin/node --version', shell=True)).rstrip()
+            return str(check_output('test -x env/bin/node && env/bin/node --version', shell=True)).rstrip()
 
     except CalledProcessError:
         return ''
@@ -124,7 +124,7 @@ def docall(cmd, cwd):
     srcdir = os.path.join(tmpd, basename)
     if 0 != docall('tar -xzf %s.tar.gz' % basename, tmpd) or \
             0 != docall('./configure --prefix=%s' % destdir, srcdir) or \
-            0 != docall('make -j 5 -s > /dev/null', srcdir) or \
+            0 != docall('make V= -j 5', srcdir) or \
             0 != docall('make install', srcdir):
         print 'Error building nodejs from source.'
         exit(1)