Compare commits

..

2 Commits

Author SHA1 Message Date
AJ ONeal e9c21e3063 Merge branch 'master' of ssh://git.coolaj86.com:22042/coolaj86/node-installer.sh 2017-11-03 15:21:35 -06:00
AJ ONeal 216aa9b420 more helpful path output 2017-11-03 15:21:25 -06:00
1 changed files with 3 additions and 1 deletions

View File

@ -254,13 +254,15 @@ if [ -z "${NODE_PATH-}" ]; then
if [ -n "$(type -p node | grep node 2>/dev/null)" ]; then if [ -n "$(type -p node | grep node 2>/dev/null)" ]; then
# /usr/local/bin/node => /usr/local # /usr/local/bin/node => /usr/local
node_install_path="$(dirname $(dirname $(type -p node)))" node_install_path="$(dirname $(dirname $(type -p node)))"
echo "NODE_PATH is not set. Using existing node install path: '$node_install_path'"
else else
node_install_path=$PREFIX/usr/local node_install_path=$PREFIX/usr/local
echo "NODE_PATH is not set. Using default install path '$node_install_path'"
fi fi
else else
node_install_path=$(dirname $(dirname $NODE_PATH)) node_install_path=$(dirname $(dirname $NODE_PATH))
echo "NODE_PATH is '$NODE_PATH', so install path is '$node_install_path'"
fi fi
echo "Install path is $node_install_path"
if [ -e "$node_install_path/bin/node" ]; then if [ -e "$node_install_path/bin/node" ]; then
# node of some version is already installed # node of some version is already installed
if [ "${NODEJS_VER}" == "$($node_install_path/bin/node -v 2>/dev/null)" ]; then if [ "${NODEJS_VER}" == "$($node_install_path/bin/node -v 2>/dev/null)" ]; then