aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonan Amicel <ronan.amicel@gmail.com>2012-10-12 12:36:04 +0200
committerRonan Amicel <ronan.amicel@gmail.com>2012-10-13 12:22:49 +0200
commit771522f3f8e4cbe7b8b32e576802323e18adce14 (patch)
tree5d8cb203be0224460b9684d8f1838680836213c9
parentPython 2.5 compatibility (diff)
downloadfabtools-771522f3f8e4cbe7b8b32e576802323e18adce14.tar.xz
Cleanup
-rw-r--r--fabtools/nodejs.py17
1 files changed, 8 insertions, 9 deletions
diff --git a/fabtools/nodejs.py b/fabtools/nodejs.py
index e7f808e..3c77695 100644
--- a/fabtools/nodejs.py
+++ b/fabtools/nodejs.py
@@ -31,11 +31,9 @@ def install_nodejs(version=DEFAULT_VERSION):
"""
require.deb.packages([
- "make",
- "openssl",
- "python",
- "libssl-dev",
- "g++",
+ 'build-essential',
+ 'python',
+ 'libssl-dev',
])
filename = 'node-v%s.tar.gz' % version
@@ -44,9 +42,10 @@ def install_nodejs(version=DEFAULT_VERSION):
run('wget http://nodejs.org/dist/v%(version)s/%(filename)s' % locals())
run('tar -xzf %s' % filename)
with cd(foldername):
- run("./configure ; make")
- sudo("make install")
- run('rm %(filename)s ; rm -rf %(foldername)s' % locals())
+ run('./configure')
+ run('make')
+ sudo('make install')
+ run('rm -rf %(filename)s %(foldername)s' % locals())
def install(package=None, version=None, global_install=True):
@@ -79,7 +78,7 @@ def install(package=None, version=None, global_install=True):
else:
run('npm install -l %s' % package)
else:
- run("npm install")
+ run('npm install')
def update(package, global_install=True):