Skip to content

Commit

Permalink
fixes run.sh merge
Browse files Browse the repository at this point in the history
  • Loading branch information
tommasodotNET committed Nov 26, 2024
1 parent f2ff5c0 commit 9ac74aa
Showing 1 changed file with 0 additions and 31 deletions.
31 changes: 0 additions & 31 deletions aspire-orchestrator/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,37 +5,6 @@ set -e
HERE="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/"
cd "$HERE"

<<<<<<< HEAD
=======
# Check node version, it must be major version 20 (any minor), otherwise show an error and exit
NODE_VERSION=$(node -v)
if [[ ! $NODE_VERSION =~ ^v(1[8-9]|[2-9][0-9]).* ]]; then
echo "Node version is $NODE_VERSION, expected 18.x.x or higher."

# Attempt to source nvm
if [ -s "$NVM_DIR/nvm.sh" ]; then
. "$NVM_DIR/nvm.sh"
elif [ -s "$HOME/.nvm/nvm.sh" ]; then
export NVM_DIR="$HOME/.nvm"
. "$NVM_DIR/nvm.sh"
else
echo "nvm not found. Please install Node 18 or higher manually."
echo "See also README.md for instructions."
exit 1
fi

echo "Installing latest LTS Node version via nvm..."
nvm install --lts
nvm use --lts

NODE_VERSION=$(node -v)
if [[ ! $NODE_VERSION =~ ^v(1[8-9]|[2-9][0-9]).* ]]; then
echo "Failed to switch to Node 18 or higher via nvm. You have $NODE_VERSION."
exit 1
fi
fi

>>>>>>> 1f6d7e847c4d4d17910ddd7c53f2b9faaaa29bcd
cd Aspire.AppHost

dotnet run

0 comments on commit 9ac74aa

Please sign in to comment.