From 7809937d744545d239c404e2c07eb078383e43b2 Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Sat, 12 May 2018 13:45:15 -0600 Subject: [PATCH] use env var for NODEJS_VER, update version --- README.md | 6 +++--- install.sh | 11 +++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 2e14335..ba4e32f 100644 --- a/README.md +++ b/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 -echo "v8.9.0" > /tmp/NODEJS_VER +# latest version at time of writing are v8.11.1 and v10.1.0 +export NODEJS_VER="v10.1.0" ``` ### Choosing an install location diff --git a/install.sh b/install.sh index 0481186..cb263ee 100644 --- a/install.sh +++ b/install.sh @@ -226,10 +226,13 @@ fi # Which node.js VERSION ? # ######################### -if [ -f "/tmp/NODEJS_VER" ]; then - NODEJS_VER=$(cat /tmp/NODEJS_VER | grep v) -elif [ -f "/tmp/IOJS_VER" ]; then - NODEJS_VER=$(cat /tmp/IOJS_VER | grep v) +if [ -z "${NODEJS_VER:-}" ]; then + # For backwards compat + if [ -f "/tmp/NODEJS_VER" ]; then + 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