From 53628d6698ffa6bc3c6355bcd59af88697aae442 Mon Sep 17 00:00:00 2001
From: Paul Walker <paul@blacksun.org.uk>
Date: Sat, 18 Oct 2025 23:57:27 +0100
Subject: [PATCH] bash: better node paths

---
 bashrc.d/node.bash | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/bashrc.d/node.bash b/bashrc.d/node.bash
index 6120e06..2310d53 100644
--- a/bashrc.d/node.bash
+++ b/bashrc.d/node.bash
@@ -1,7 +1,18 @@
 # Set up NPM
-NPM_PACKAGES="$HOME/.npm-packages"
-NODE_PATH="$NPM_PACKAGES/lib/node_modules:$NODE_PATH"
-MANPATH="$MANPATH:$NPM_PACKAGES/share/man"
-addpath $NPM_PACKAGES/bin
-addpath "$HOME/.yarn/bin"
-addpath "$HOME/.config/yarn/global/node_modules/.bin"
+# NPM_PACKAGES="$HOME/.npm-packages"
+# NODE_PATH="$NPM_PACKAGES/lib/node_modules:$NODE_PATH"
+# MANPATH="$MANPATH:$NPM_PACKAGES/share/man"
+# addpath $NPM_PACKAGES/bin
+NPM=$(which npm)
+if [ -n "$NPM" ] ; then
+  NPM_PATH=$(npm get prefix)
+  NPM_G_PATH=$(npm get prefix -g)
+  addpath $NPM_PATH/bin
+  addpath $NPM_G_PATH/bin
+fi
+
+YARN=$(which yarn)
+if [ -n "$YARN" ] ; then
+  addpath "$HOME/.yarn/bin"
+  addpath "$HOME/.config/yarn/global/node_modules/.bin"
+fi