File tree Expand file tree Collapse file tree 1 file changed +1
-5
lines changed Expand file tree Collapse file tree 1 file changed +1
-5
lines changed Original file line number Diff line number Diff line change @@ -16,11 +16,7 @@ INSTALLED_NODE_PATCH=$(echo "$INSTALLED_NODE_VERSION" | cut -d. -f3)
16
16
if [[ " $INSTALLED_NODE_MAJOR " -lt " $REQUIRED_NODE_MAJOR " ||
17
17
(" $INSTALLED_NODE_MAJOR " -eq " $REQUIRED_NODE_MAJOR " && " $INSTALLED_NODE_MINOR " -lt " $REQUIRED_NODE_MINOR " ) ||
18
18
(" $INSTALLED_NODE_MAJOR " -eq " $REQUIRED_NODE_MAJOR " && " $INSTALLED_NODE_MINOR " -eq " $REQUIRED_NODE_MINOR " && " $INSTALLED_NODE_PATCH " -lt " $REQUIRED_NODE_PATCH " ) ]]; then
19
- <<< <<< < Updated upstream
20
- exec $SHELL -c " sh ./setup.sh; source ~/.zshrc; tea +nodejs.org'=$REQUIRED_NODE_VERSION ' >/dev/null 2>&1 ; echo Node.js installed:;tea +nodejs.org'=$REQUIRED_NODE_VERSION ' node -v; echo pnpm installed:; pnpm -v;"
21
- =======
22
- exec $SHELL -c " sh ./setup.sh; source ~/.zshrc; tea +nodejs.org'=$REQUIRED_NODE_VERSION ' >/dev/null 2>&1; echo Stacks Managed:; echo -e '• Node version installed:\n'; tea +nodejs.org'=$REQUIRED_NODE_VERSION ' node -v; echo -e '\n• Pnpm version installed:\n'; pnpm -v;"
23
- >>>>>>> Stashed changes
19
+ exec $SHELL -c " sh ./setup.sh; source ~/.zshrc; tea +nodejs.org'=$REQUIRED_NODE_VERSION ' >/dev/null 2>&1; echo Stacks Managed:; echo -e '• Node version installed:\n'; tea +nodejs.org'=$REQUIRED_NODE_VERSION ' node -v; echo -e '\n• Pnpm version installed:\n'; pnpm -v;"
24
20
fi
25
21
26
22
echo " Node.js v$REQUIRED_NODE_VERSION or greater is installed!"
You can’t perform that action at this time.
0 commit comments