From 3c360c64c4a4ab2da4c09dbbef0b2e88ba8e21ab Mon Sep 17 00:00:00 2001 From: Earle Lowe <30607889+emlowe@users.noreply.github.com> Date: Wed, 17 Sep 2025 10:04:47 -0700 Subject: [PATCH 1/4] Add llvm installation for MacOS in install-gui.sh --- install-gui.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install-gui.sh b/install-gui.sh index 813864142117..724c696023e4 100755 --- a/install-gui.sh +++ b/install-gui.sh @@ -163,6 +163,7 @@ elif [ "$(uname)" = "Darwin" ] && type brew >/dev/null 2>&1; then # MacOS if ! nodejs_is_installed; then echo "Installing nodejs on MacOS" + brew install llvm brew install npm fi do_install_npm_locally From 3b04ef8c45ac38a45f65052819cf4190b334ecd7 Mon Sep 17 00:00:00 2001 From: Earle Lowe <30607889+emlowe@users.noreply.github.com> Date: Wed, 17 Sep 2025 10:30:12 -0700 Subject: [PATCH 2/4] Use nvm to install Node.js on MacOS --- install-gui.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/install-gui.sh b/install-gui.sh index 724c696023e4..1a2c1594479e 100755 --- a/install-gui.sh +++ b/install-gui.sh @@ -163,8 +163,16 @@ elif [ "$(uname)" = "Darwin" ] && type brew >/dev/null 2>&1; then # MacOS if ! nodejs_is_installed; then echo "Installing nodejs on MacOS" - brew install llvm - brew install npm + # Download and install nvm: + curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash + # in lieu of restarting the shell + \. "$HOME/.nvm/nvm.sh" + # Download and install Node.js: + nvm install 20 + echo "Node version" + node -v + echo "npm version:" + npm -v fi do_install_npm_locally elif [ "$(uname)" = "OpenBSD" ]; then From f2f01318dda6fbca086523e471e22f7339634db4 Mon Sep 17 00:00:00 2001 From: Earle Lowe Date: Wed, 17 Sep 2025 10:37:14 -0700 Subject: [PATCH 3/4] use source instead of dot --- install-gui.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-gui.sh b/install-gui.sh index 1a2c1594479e..6288b83049fd 100755 --- a/install-gui.sh +++ b/install-gui.sh @@ -166,7 +166,7 @@ elif [ "$(uname)" = "Darwin" ] && type brew >/dev/null 2>&1; then # Download and install nvm: curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash # in lieu of restarting the shell - \. "$HOME/.nvm/nvm.sh" + source "$HOME/.nvm/nvm.sh" # Download and install Node.js: nvm install 20 echo "Node version" From a3e35b72c05b24d350a90118206a7bcef8924467 Mon Sep 17 00:00:00 2001 From: Earle Lowe Date: Wed, 17 Sep 2025 10:56:52 -0700 Subject: [PATCH 4/4] shellcheck workaround for super linter --- install-gui.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install-gui.sh b/install-gui.sh index 6288b83049fd..7467fba433cc 100755 --- a/install-gui.sh +++ b/install-gui.sh @@ -166,6 +166,7 @@ elif [ "$(uname)" = "Darwin" ] && type brew >/dev/null 2>&1; then # Download and install nvm: curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash # in lieu of restarting the shell + # shellcheck source=/dev/null source "$HOME/.nvm/nvm.sh" # Download and install Node.js: nvm install 20