README.md

@@ -1,16 +1,6 @@
-# STOP
-
-The install method in this repo still has its place, but this is no longer maintained.
-
-**Update**: Use [Webi](https://webinstall.dev) instead:
-
-```sh
-curl https://webinstall.dev/node | bash
-```
-
 # Easy Install node.js
 
-| A [Root](https://rootprojects.org) Project |
+| Sponsored by [ppl](https://ppl.family) |
 
 Simple node.js installer for macOS and Linux
 

install.sh

@@ -56,38 +56,37 @@ if [ "$(uname | grep -i 'Darwin')" ]; then
     exit 1
   fi
 
-  # Mavericks+ works for all current macOS versions
-  OS='mavericks'
-
-  if [[ "$OSX_MAJOR" -eq 10 ]]; then
-    #
-    # Minor
-    #
-    if [ "$OSX_MINOR" -le 5 ]; then
-      echo "unsupported OS X version (os 10.5-)"
-      exit 1
-    fi
-
-    # Snow
-    if [ "$OSX_MINOR" -eq 6 ]; then
-      OS='snow'
-    fi
-
-    # Lion
-    if [ $OSX_MINOR -eq 7 ]; then
-      OS='lion'
-    fi
-
-    # Mountain Lion
-    if [ "$OSX_MINOR" -eq 8 ]; then
-      OS='mountain'
-    fi
+  if [ "$OSX_MAJOR" -gt 10 ]; then
+    echo "unsupported OS X version (os 11+)"
+    exit 1
   fi
 
-  # OS X (10) and macOS (11) should be supported
+  #
+  # Minor
+  #
+  if [ "$OSX_MINOR" -le 5 ]; then
+    echo "unsupported OS X version (os 10.5-)"
+    exit 1
+  fi
 
-  if [ "$OSX_MAJOR" -gt 11 ]; then
-    echo "WARNING: macOS 12+ may or may not be supported"
+  # Snow
+  if [ "$OSX_MINOR" -eq 6 ]; then
+    OS='snow'
+  fi
+
+  # Lion
+  if [ $OSX_MINOR -eq 7 ]; then
+    OS='lion'
+  fi
+
+  # Mountain Lion
+  if [ "$OSX_MINOR" -eq 8 ]; then
+    OS='mountain'
+  fi
+
+  # Mavericks, Yosemite
+  if [ "$OSX_MINOR" -ge 9 ]; then
+    OS='mavericks'
   fi
 
   if [ -n "$(sysctl hw | grep 64bit | grep ': 1')" ]; then
@@ -233,11 +232,7 @@ fi
 #########################
 
 NODE_VERSION=${NODE_VERSION:-}
-NODEJS_VER=${NODEJS_VER:-}
-if [ -n "$NODE_VERSION" ]; then
-  NODEJS_VER=$NODE_VERSION
-fi
-
+NODEJS_VER=${NODE_VERSION:-$NODEJS_VER}
 if [ -z "${NODEJS_VER:-}" ]; then
   # For backwards compat
   if [ -f "$my_tmp/NODEJS_VER" ]; then
@@ -321,8 +316,8 @@ if [ -n "${NODEJS_VER}" ]; then
   bash "$my_tmp/${INSTALL_FILE}" "${NODEJS_VER}"
 fi
 
-mkdir -p $node_install_path/lib/node_modules 2> /dev/null || $sudo_cmd mkdir -p $node_install_path/lib/node_modules
-chown -R $(whoami) $node_install_path/lib/node_modules 2> /dev/null || $sudo_cmd chown -R $(whoami) $node_install_path/lib/node_modules
+mkdir -p $node_install_path/lib/node_modules || $sudo_cmd mkdir -p $node_install_path/lib/node_modules
+chown -R $(whoami) $node_install_path/lib/node_modules || $sudo_cmd chown -R $(whoami) $node_install_path/lib/node_modules
 
 echo ""
 

setup-node-ubuntu.bash

@@ -73,15 +73,15 @@ if [ -n "${NODEJS_VER}" ]; then
   rm ${NODEJS_UNTAR}/{LICENSE,CHANGELOG.md,README.md}
   if [ -n "$(command -v rsync 2>/dev/null | grep rsync)" ]; then
     echo $sudo_cmd rsync -Krl "${NODEJS_UNTAR}/" "$node_install_path/"
-    rsync -Krl "${NODEJS_UNTAR}/" "$node_install_path/" 2>/dev/null || $sudo_cmd rsync -Krl "${NODEJS_UNTAR}/" "$node_install_path/"
+    rsync -Krl "${NODEJS_UNTAR}/" "$node_install_path/" || $sudo_cmd rsync -Krl "${NODEJS_UNTAR}/" "$node_install_path/"
   else
     # due to symlink issues on Arch Linux, don't copy the share directory
     rm -rf ${NODEJS_UNTAR}/share
     echo $sudo_cmd cp -Hr "${NODEJS_UNTAR}/*" "$node_install_path/"
-    cp -Hr "${NODEJS_UNTAR}"/* "$node_install_path/" 2>/dev/null || $sudo_cmd cp -Hr "${NODEJS_UNTAR}"/* "$node_install_path/"
+    cp -Hr "${NODEJS_UNTAR}"/* "$node_install_path/" || $sudo_cmd cp -Hr "${NODEJS_UNTAR}"/* "$node_install_path/"
   fi
   rm -rf "${NODEJS_UNTAR}"
 
-  chown -R $(whoami) "$node_install_path/lib/node_modules/" 2>/dev/null || $sudo_cmd chown -R $(whoami) "$node_install_path/lib/node_modules/"
-  chown $(whoami) ""$node_install_path"/bin/" 2>/dev/null || $sudo_cmd chown $(whoami) ""$node_install_path"/bin/"
+  chown -R $(whoami) "$node_install_path/lib/node_modules/" || $sudo_cmd chown -R $(whoami) "$node_install_path/lib/node_modules/"
+  chown $(whoami) ""$node_install_path"/bin/" || $sudo_cmd chown $(whoami) ""$node_install_path"/bin/"
 fi