File tree Expand file tree Collapse file tree 3 files changed +10
-7
lines changed Expand file tree Collapse file tree 3 files changed +10
-7
lines changed Original file line number Diff line number Diff line change 2222default [ 'nodejs' ] [ 'checksum' ] = '94bbdb2d62645fd2ad5b96e41cfec68abf004fd03fabaaf7d71c48b39013cbd1'
2323default [ 'nodejs' ] [ 'dir' ] = '/usr/local'
2424default [ 'nodejs' ] [ 'npm' ] = '1.1.2'
25+
26+ nodejs_tar_path = "node-v#{ node [ 'nodejs' ] [ 'version' ] } .tar.gz"
27+ if node [ 'nodejs' ] [ 'version' ] . split ( '.' ) [ 1 ] . to_i >= 5
28+ nodejs_tar_path = "v#{ node [ 'nodejs' ] [ 'version' ] } /#{ nodejs_tar_path } "
29+ end
30+
31+ default [ 'nodejs' ] [ 'src_url' ] = "http://nodejs.org/dist/#{ nodejs_tar_path } "
32+ default [ 'nodejs' ] [ 'npm_src_url' ] = "http://registry.npmjs.org/npm/-/npm-#{ node [ 'nodejs' ] [ 'npm' ] } .tgz"
Original file line number Diff line number Diff line change 2828end
2929
3030nodejs_tar = "node-v#{ node [ 'nodejs' ] [ 'version' ] } .tar.gz"
31- nodejs_tar_path = nodejs_tar
32-
33- if node [ 'nodejs' ] [ 'version' ] . split ( '.' ) [ 1 ] . to_i >= 5
34- nodejs_tar_path = "v#{ node [ 'nodejs' ] [ 'version' ] } /#{ nodejs_tar_path } "
35- end
3631
3732remote_file "/usr/local/src/#{ nodejs_tar } " do
38- source "http:// nodejs.org/dist/ #{ nodejs_tar_path } "
33+ source node [ ' nodejs' ] [ 'src_url' ]
3934 checksum node [ 'nodejs' ] [ 'checksum' ]
4035 mode 0644
4136end
Original file line number Diff line number Diff line change 2828 code <<-EOH
2929 mkdir -p npm-v#{ node [ 'nodejs' ] [ 'npm' ] } && \
3030 cd npm-v#{ node [ 'nodejs' ] [ 'npm' ] }
31- curl -L http://registry.npmjs.org/npm/-/npm- #{ node [ 'nodejs' ] [ 'npm ' ] } .tgz | tar xzf - --strip-components=1 && \
31+ curl -L #{ node [ 'nodejs' ] [ 'npm_src_url ' ] } | tar xzf - --strip-components=1 && \
3232 make uninstall dev
3333 EOH
3434 not_if "#{ node [ 'nodejs' ] [ 'dir' ] } /bin/npm -v 2>&1 | grep '#{ node [ 'nodejs' ] [ 'npm' ] } '"
You can’t perform that action at this time.
0 commit comments