diff options
| author | isaacs <i@izs.me> | 2011-01-29 00:35:10 +0300 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2011-01-29 01:08:29 +0300 |
| commit | 67f20b19434694a38277d704e355be110c195cd6 (patch) | |
| tree | 17cf9ad252f6a16ccf555d540220f6044224de89 /scripts | |
| parent | 33e1cd4706a0a93fe1833e2bf3f58697d41cbcf7 (diff) | |
Don't check node version before downloading npm.
Duh. Can't believe this has been unfixed for so long.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/install.sh | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/scripts/install.sh b/scripts/install.sh index 8cbd0e4c4..ce45e1d7c 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -36,20 +36,6 @@ if [ $? -ne 0 ] || ! [ -x $egrep ]; then egrep=egrep fi -node_version=`$node --version 2>&1` -ret=$? -if [ $ret -eq 0 ]; then - req=`$node bin/read-package-json.js package.json engines.node` - $node bin/semver.js -v "$node_version" -r "$req" - ret=$? -fi -if [ $ret -ne 0 ]; then - echo "You need node $req to run this program." >&2 - echo "node --version reports: $node_version" >&2 - echo "Please upgrade node before continuing." - exit $ret -fi - make=`which gmake 2>&1` if [ $? -ne 0 ] || ! [ -x $make ]; then make=`which make 2>&1` @@ -71,6 +57,19 @@ fi cd "$TMP" \ && curl -L "$url" | $tar -xzf - \ && cd * \ + && (node_version=`$node --version 2>&1` + ret=$? + if [ $ret -eq 0 ]; then + req=`$node bin/read-package-json.js package.json engines.node` + $node bin/semver.js -v "$node_version" -r "$req" + ret=$? + fi + if [ $ret -ne 0 ]; then + echo "You need node $req to run this program." >&2 + echo "node --version reports: $node_version" >&2 + echo "Please upgrade node before continuing." + exit $ret + fi) && (if ! [ "$make" = "NOMAKE" ]; then $make uninstall dev else |