diff --git a/.config/fish/path.fish b/.config/fish/path.fish index 0a0702f3..9b3c332b 100644 --- a/.config/fish/path.fish +++ b/.config/fish/path.fish @@ -11,4 +11,5 @@ if test -d $RUBY_PATH end # node path -set -gx NODE_PATH /usr/local/share/.config/yarn/global/node_modules:/usr/lib/node_modules +#set -gx NODE_PATH /usr/local/share/.config/yarn/global/node_modules:/usr/lib/node_modules +set -gx NODE_PATH /usr/lib/node_modules diff --git a/.path b/.path index 017884a1..f13e2ce6 100644 --- a/.path +++ b/.path @@ -12,4 +12,5 @@ if [ -d "$RUBY_PATH" ] ; then fi # Node path -export NODE_PATH=/usr/local/share/.config/yarn/global/node_modules:/usr/lib/node_modules; +#export NODE_PATH=/usr/local/share/.config/yarn/global/node_modules:/usr/lib/node_modules; +export NODE_PATH=/usr/lib/node_modules; diff --git a/bootstrap/clean b/bootstrap/clean index 3ee3da53..b12d79eb 100755 --- a/bootstrap/clean +++ b/bootstrap/clean @@ -55,7 +55,7 @@ fi if command -v yarn 1>/dev/null; then - yarn_installed="$(jq -r < /usr/local/share/.config/yarn/global/package.json '.dependencies | keys[]')" + yarn_installed="$(jq -r < /usr/local/share/.config/yarn/global/package.json '.dependencies | keys[]' 2>/dev/null)" function _y ( ) { if { <<< "$pacman_installed" grep "^$1\$" 1>/dev/null 2>&1 ; } ; then diff --git a/bootstrap/update-node b/bootstrap/update-node index 4095d5a7..618799b5 100755 --- a/bootstrap/update-node +++ b/bootstrap/update-node @@ -5,11 +5,12 @@ if [ $(id -u) != "0" ]; then exit 1 fi -if command -v yarn 1>/dev/null; then +if false; then +#if command -v yarn 1>/dev/null; then echo " # using yarn" - yarn_installed="$(jq -r < /usr/local/share/.config/yarn/global/package.json '.dependencies | keys[]')" + yarn_installed="$(jq -r < /usr/local/share/.config/yarn/global/package.json '.dependencies | keys[]' 2>/dev/null)" function _ ( ) { if ! { <<< "$yarn_installed" grep "^$1\$" 1>/dev/null 2>&1 ; } ; then