Skip to content

Commit 2aba82e

Browse files
committed
chore: wip
1 parent 1ad19e2 commit 2aba82e

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

.stacks/scripts/ensure.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@ INSTALLED_NODE_PATCH=$(echo "$INSTALLED_NODE_VERSION" | cut -d. -f3)
1616
if [[ "$INSTALLED_NODE_MAJOR" -lt "$REQUIRED_NODE_MAJOR" ||
1717
("$INSTALLED_NODE_MAJOR" -eq "$REQUIRED_NODE_MAJOR" && "$INSTALLED_NODE_MINOR" -lt "$REQUIRED_NODE_MINOR") ||
1818
("$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;"
2420
fi
2521

2622
echo "Node.js v$REQUIRED_NODE_VERSION or greater is installed!"

0 commit comments

Comments
 (0)