mirror of
https://github.com/LPJon/cwpfixes.git
synced 2026-09-10 22:20:47 -05:00
Update install_terminal
Changed the way the current NVM Node.JS file path is obtained to be used for the system symbolic link
This commit is contained in:
@@ -16,6 +16,9 @@ function getsystemnodeversion {
|
|||||||
function checkfornodejsrpm {
|
function checkfornodejsrpm {
|
||||||
yum list installed nodejs | grep nodejs
|
yum list installed nodejs | grep nodejs
|
||||||
}
|
}
|
||||||
|
function currentnodefilepath {
|
||||||
|
nvm which current
|
||||||
|
}
|
||||||
if [ "$usenvm" == "n" ]; then
|
if [ "$usenvm" == "n" ]; then
|
||||||
if [ -e "$HOME/.nvm" ]; then
|
if [ -e "$HOME/.nvm" ]; then
|
||||||
if [ -z "$(checkfornodejsrpm)" ]; then
|
if [ -z "$(checkfornodejsrpm)" ]; then
|
||||||
@@ -44,10 +47,10 @@ elif [ "$usenvm" == "y" ]; then
|
|||||||
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
|
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
|
||||||
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
|
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
|
||||||
nvm install $nodeversion
|
nvm install $nodeversion
|
||||||
|
nvm use $nodeversion
|
||||||
if [ "$(getsystemnodeversion)" != "v$nodeversion" ]; then
|
if [ "$(getsystemnodeversion)" != "v$nodeversion" ]; then
|
||||||
ln -sf /root/.nvm/versions/node/v"$nodeversion"/bin/node /usr/bin/node
|
ln -sf $(currentnodefilepath) /usr/bin/node
|
||||||
fi
|
fi
|
||||||
nvm use system
|
|
||||||
fi
|
fi
|
||||||
if [ ! -e "$HOME/.nvm" ]; then
|
if [ ! -e "$HOME/.nvm" ]; then
|
||||||
yum -y install curl
|
yum -y install curl
|
||||||
@@ -56,8 +59,8 @@ elif [ "$usenvm" == "y" ]; then
|
|||||||
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
|
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
|
||||||
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
|
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
|
||||||
nvm install "$nodeversion"
|
nvm install "$nodeversion"
|
||||||
ln -sf /root/.nvm/versions/node/v"$nodeversion"/bin/node /usr/bin/node
|
nvm use $nodeversion
|
||||||
nvm use system
|
ln -sf $(currentnodefilepath) /usr/bin/node
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user