Merge branch 'master' of ssh://git.coolaj86.com:22042/coolaj86/node-installer.sh

README.md

@@ -1,6 +1,6 @@
 # Easy Install node.js
 
-| Sponsored by [ppl](https://ppl.family) and [Daplie](https://dapliefounder.com).
+| Sponsored by [ppl](https://ppl.family) |
 
 Automated node.js installers for OS X and Ubuntu
 
@@ -41,8 +41,8 @@ echo "Current node.js version is $(curl -fsSL https://nodejs.org/dist/index.tab
 
 ```bash
 # To install a specific version rather than defaulting to latest
-# latest version at time of writing are v8.9.0 and v9.0.0
+# latest version at time of writing are v8.11.1 and v10.1.0
-echo "v8.9.0" > /tmp/NODEJS_VER
+export NODEJS_VER="v10.1.0"
 ```
 
 ### Choosing an install location

install.sh

@@ -226,10 +226,13 @@ fi
 # Which node.js VERSION ? #
 #########################
 
-if [ -f "/tmp/NODEJS_VER" ]; then
+if [ -z "${NODEJS_VER:-}" ]; then
-  NODEJS_VER=$(cat /tmp/NODEJS_VER | grep v)
+  # For backwards compat
-elif [ -f "/tmp/IOJS_VER" ]; then
+  if [ -f "/tmp/NODEJS_VER" ]; then
-  NODEJS_VER=$(cat /tmp/IOJS_VER | grep v)
+    NODEJS_VER=$(cat /tmp/NODEJS_VER | grep v)
+  elif [ -f "/tmp/IOJS_VER" ]; then
+    NODEJS_VER=$(cat /tmp/IOJS_VER | grep v)
+  fi
 fi
 
 if [ -n "$NODEJS_VER" ]; then