diff --git a/install_terminal b/install_terminal index c24ee93..88f928d 100644 --- a/install_terminal +++ b/install_terminal @@ -4,14 +4,13 @@ yum -y update ca-certificates # NEW CODE # Use NVM for node.js installation management. Options are "y" or "n" DEFAULT = n -usenvm=n +usenvm=y # Version of Node.js to install. DEFAULT = 16.18.1 nodeversion=16.18.1 -function getnodeversion { - node -v +function getsystemnodeversion { + /usr/bin/node -v } - if [ "$usenvm" == "n" ]; then if [ ! -e "/usr/bin/node" ];then yum -y install nodejs --enablerepo=epel @@ -27,18 +26,21 @@ if [ "$usenvm" == "n" ]; then cd /root fi elif [ "$usenvm" == "y" ]; then - if [ ! -d "$HOME/.nvm" ]; then + if [ -e "$HOME/.nvm" ];then + source $HOME/.bashrc + nvm install $nodeversion + nvm use $nodeversion + if [ "$(getsystemnodeversion)" != "v$nodeversion" ]; then + ln -sf /root/.nvm/versions/node/v"$nodeversion"/bin/node /usr/bin/node + fi + fi + if [ ! -e "$HOME/.nvm" ]; then yum -y install curl curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash source $HOME/.bashrc nvm install "$nodeversion" nvm use "$nodeversion" fi - if [ -d "$HOME/.nvm" ];then - if [ "getnodeversion" != "v$nodeversion" ]; then - ln -sf /root/.nvm/versions/node/v$nodeversion/bin/node - fi - fi fi # Old Code