diff --git a/dev-setup.sh b/dev-setup.sh index b77dd1b..5f4e57f 100755 --- a/dev-setup.sh +++ b/dev-setup.sh @@ -83,9 +83,14 @@ sudo apt-get install -y \ sudo cp $scriptdir/dependencies/libblake3.so /usr/local/lib/ # NodeJs -sudo apt-get install -y ca-certificates # In case nodejs package certitficates are renewed. -curl -fsSL https://deb.nodesource.com/setup_16.x | sudo -E bash - -sudo apt-get install -y nodejs +apt-get install -y ca-certificates curl gnupg +mkdir -p /etc/apt/keyrings +curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg + +NODE_MAJOR=20 +echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list +apt-get update +apt-get -y install nodejs # Update linker library cache. sudo ldconfig diff --git a/installer/prereq.sh b/installer/prereq.sh index cdcfd2d..c6defb0 100755 --- a/installer/prereq.sh +++ b/installer/prereq.sh @@ -45,15 +45,15 @@ if ! command -v node &>/dev/null; then mkdir -p /etc/apt/keyrings curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg - NODE_MAJOR=16 + NODE_MAJOR=20 echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list apt-get update apt-get -y install nodejs else version=$(node -v | cut -d '.' -f1) version=${version:1} - if [[ $version -lt 16 ]]; then - echo "Found node $version, recommended node v16.x.x or later" + if [[ $version -lt 20 ]]; then + echo "Found node $version, recommended node v20.x.x or later" fi fi diff --git a/installer/setup.sh b/installer/setup.sh index 8bdbf44..054074e 100755 --- a/installer/setup.sh +++ b/installer/setup.sh @@ -227,7 +227,7 @@ function install_nodejs_utility() { mkdir -p /etc/apt/keyrings curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg - NODE_MAJOR=16 + NODE_MAJOR=20 echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list apt-get update apt-get -y install nodejs @@ -242,8 +242,8 @@ function check_prereq() { else version=$(node -v | cut -d '.' -f1) version=${version:1} - if [[ $version -lt 16 ]]; then - echo "$evernode requires NodeJs 16.x or later. You system has NodeJs $version installed. Either remove the NodeJs installation or upgrade to NodeJs 16.x." + if [[ $version -lt 20 ]]; then + echo "$evernode requires NodeJs 20.x or later. You system has NodeJs $version installed. Either remove the NodeJs installation or upgrade to NodeJs 20.x." exit 1 fi fi