From de476d822fb7039421d77891559e560e79aaa005 Mon Sep 17 00:00:00 2001
From: LPJon <46533576+LPJon@users.noreply.github.com>
Date: Thu, 31 Aug 2023 00:11:53 -0500
Subject: [PATCH] Update install_terminal

Changed code flow when checking for the .nvm directory
---
 install_terminal | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

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