From 0dc32b47d739364d36b5cd4bcf5c396a5a371dfb Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Wed, 29 Apr 2020 19:33:49 +0000 Subject: [PATCH] vastly simplify node.bash --- node/node.bash | 105 +++++++++++++++++-------------------------------- 1 file changed, 37 insertions(+), 68 deletions(-) diff --git a/node/node.bash b/node/node.bash index cac1272..13d379d 100644 --- a/node/node.bash +++ b/node/node.bash @@ -51,86 +51,61 @@ set -e set -u -NODEJS_VER=${WEBI_VERSION:-} -NODEJS_VER="${NODEJS_VER:-v}" # Search for 'v' at the least - -# WEBI_ARCH uses only slightly different names from NODE_ARCH -NODE_OS="${WEBI_OS}" # linux or darwin -NODE_ARCH="${WEBI_ARCH}" -if [ "amd64" == "$NODE_ARCH" ]; then - NODE_ARCH="x64" -fi +my_tmp=${WEBI_TMP:-$(mktemp -d node-install.XXXXXX)} +sudo_cmd=${WEBI_SUDO:-} + +http_get() { + if [ -n "$(command -v curl 2>/dev/null | grep curl)" ]; then + curl -fsSL $1 -o $2 || echo 'error downloading node' + elif [ -n "$(command -v wget 2>/dev/null | grep wget)" ]; then + wget --quiet $1 -O $2 || echo 'error downloading node' + else + echo "'wget' and 'curl' are missing. Please run the following command and try again" + echo "" + echo " sudo apt-get install --yes curl wget" + exit 1 + fi +} -my_tmp="$WEBI_TMP" -sudo_cmd="$WEBI_SUDO" +WEBI_TAB=$(curl -fsSL "https://webinstall.dev/api/releases/node@${WEBI_VERSION:-}.csv?os=$(uname -s)&arch=$(uname -m)&ext=tar&limit=1" -H "User-Agent: $(uname -a)") +NODEJS_VER=$(echo $WEBI_TAB | cut -d ',' -f 1) +NODEJS_REMOTE=$(echo $WEBI_TAB | cut -d ',' -f 9) +NODEJS_LOCAL="$my_tmp/$(echo $NODEJS_REMOTE | sed s:.*/::)" +NODE_OS="$(echo $WEBI_TAB | cut -d ',' -f 5)" ######### # BEGIN # ######### -get_node_version() { - # sort -rV # will sort by version number, but it appears these are already sorted - # tail -n +2 # starts at line two (1-indexed) and all after (omits the csv header with 'version' and such) - # cut -f 1 # gets only the first column - # head -n 1 # gets only the most recent version - my_char="." - my_count=$(awk -F"${my_char}" '{print NF-1}' <<< "${NODEJS_VER}") - # get the latest version if partial - if [ $my_count -ne 2 ]; then - if [ "$NODEJS_VER" != "v" ]; then - NODEJS_VER="$NODEJS_VER\\." - fi - if [ -n "$(type -p curl)" ]; then - NODEJS_VER=$(curl -fsL "https://nodejs.org/dist/index.tab" | tail -n +2 | cut -f 1 | grep "^$NODEJS_VER" | head -n 1) \ - || echo 'error automatically determining current node.js version' - elif [ -n "$(type -p wget)" ]; then - NODEJS_VER=$(wget --quiet "https://nodejs.org/dist/index.tab" -O - | tail -n +2 | cut -f 1 | grep "^$NODEJS_VER" | head -n 1) \ - || echo 'error automatically determining current node.js version' - else - echo "Found neither 'curl' nor 'wget'. Can't Continue." - exit 1 - fi - fi -} - -get_node_version +# WEBI_ARCH uses only slightly different names from NODE_ARCH +NODE_ARCH="$(echo $WEBI_TAB | cut -d ',' -f 6)" +if [ "amd64" == "$NODE_ARCH" ]; then + NODE_ARCH="x64" +fi -# -# node -# -node_install_path=$HOME/.local/opt/node-${NODEJS_VER} +node_install_path=$HOME/.local/opt/node-v${NODEJS_VER} mkdir -p $node_install_path -# TODO warn if existing node in path my take precedence if [ -e "$node_install_path/bin/node" ]; then # node of some version is already installed - if [ "${NODEJS_VER}" == "$($node_install_path/bin/node -v 2>/dev/null)" ]; then + if [ "v${NODEJS_VER}" == "$($node_install_path/bin/node -v 2>/dev/null)" ]; then echo node ${NODEJS_VER} already installed at $node_install_path exit 0 fi fi -NODEJS_REMOTE="https://nodejs.org/dist/${NODEJS_VER}/node-${NODEJS_VER}-${NODE_OS}-${NODE_ARCH}.tar.gz" -NODEJS_LOCAL="$my_tmp/node-${NODEJS_VER}-${NODE_OS}-${NODE_ARCH}.tar.gz" -NODEJS_UNTAR="$my_tmp/node-${NODEJS_VER}-${NODE_OS}-${NODE_ARCH}" +# TODO warn if existing node in path my take precedence -echo "installing node as node ${NODEJS_VER}..." +echo "downloading node v${NODEJS_VER}..." +http_get ${NODEJS_REMOTE} ${NODEJS_LOCAL} || echo 'error downloading node' -if [ -n "$(command -v curl 2>/dev/null | grep curl)" ]; then - curl -fsSL ${NODEJS_REMOTE} -o ${NODEJS_LOCAL} || echo 'error downloading node' -elif [ -n "$(command -v wget 2>/dev/null | grep wget)" ]; then - wget --quiet ${NODEJS_REMOTE} -O ${NODEJS_LOCAL} || echo 'error downloading node' -else - echo "'wget' and 'curl' are missing. Please run the following command and try again" - echo " sudo apt-get install --yes curl wget" - exit 1 -fi +echo "installing node v${NODEJS_VER}..." +tar xf ${NODEJS_LOCAL} -C $my_tmp/ +# we know how it'll unpack +NODEJS_UNTAR=$my_tmp/node-v${NODEJS_VER}-${NODE_OS}-${NODE_ARCH} -mkdir -p ${NODEJS_UNTAR}/ -# --strip-components isn't portable, switch to portable version by performing move step after untar -tar xf ${NODEJS_LOCAL} -C ${NODEJS_UNTAR}/ #--strip-components=1 -mv ${NODEJS_UNTAR}/node-${NODEJS_VER}-${NODE_OS}-${NODE_ARCH}/* ${NODEJS_UNTAR}/ -rm -rf ${NODEJS_UNTAR}/node-${NODEJS_VER}-${NODE_OS}-${NODE_ARCH} # clean up the temporary unzip folder +# this funny business is to allow something a non-/opt directory +# ( such as /usr/local ) to be an install target 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/" @@ -141,14 +116,8 @@ else 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/" fi -echo "" 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/ - -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 +rm -rf "${my_tmp}" # By default, npm is stupid and uses any version of node in any path. Stop that. # npm config set scripts-prepend-node-path true -- 2.25.1