From c4ef2f0908d73bffbf0923d0631b03cc3a4c281f Mon Sep 17 00:00:00 2001 From: Gilver Date: Mon, 1 Dec 2025 09:08:40 -0600 Subject: [PATCH] fix(nvm): Hardcode default dir unless explicitly set otherwise (#7833) --- anda/tools/nvm/binscript | 2 +- anda/tools/nvm/nvm-always-use-default-dir.patch | 11 +++++++++++ anda/tools/nvm/nvm.spec | 6 ++++-- 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 anda/tools/nvm/nvm-always-use-default-dir.patch diff --git a/anda/tools/nvm/binscript b/anda/tools/nvm/binscript index b12d8bbb74..fa7244c0af 100644 --- a/anda/tools/nvm/binscript +++ b/anda/tools/nvm/binscript @@ -1,5 +1,5 @@ #!/usr/bin/sh -source /etc/profile.d/nvm.sh +. /etc/profile.d/nvm.sh nvm $@ diff --git a/anda/tools/nvm/nvm-always-use-default-dir.patch b/anda/tools/nvm/nvm-always-use-default-dir.patch new file mode 100644 index 0000000000..63b0e505d5 --- /dev/null +++ b/anda/tools/nvm/nvm-always-use-default-dir.patch @@ -0,0 +1,11 @@ +--- a/nvm.sh 2025-04-23 18:34:31.000000000 -0500 ++++ b/nvm.sh 2025-12-01 07:26:54.550237797 -0600 +@@ -449,7 +449,7 @@ + NVM_SCRIPT_SOURCE="${BASH_SOURCE}" + fi + # shellcheck disable=SC2086 +- NVM_DIR="$(nvm_cd ${NVM_CD_FLAGS} "$(dirname "${NVM_SCRIPT_SOURCE:-$0}")" >/dev/null && \pwd)" ++ NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")" + export NVM_DIR + else + # https://unix.stackexchange.com/a/198289 diff --git a/anda/tools/nvm/nvm.spec b/anda/tools/nvm/nvm.spec index c2e3bc7e00..0262ac182d 100644 --- a/anda/tools/nvm/nvm.spec +++ b/anda/tools/nvm/nvm.spec @@ -1,11 +1,13 @@ Name: nvm Version: 0.40.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Node Version Manager License: MIT URL: https://github.com/nvm-sh/nvm Source0: %{url}/archive/refs/tags/v%{version}.tar.gz Source1: binscript +# Make sure NVM always chooses "$HOME/.nvm" as the directory for local files unless explicitly set otherwise +Patch0: nvm-always-use-default-dir.patch # Only works with POSIX compliant shells Requires: (bash or dash or ksh or zsh) BuildArch: noarch @@ -17,7 +19,7 @@ POSIX-compliant script to manage multiple active Node.js versions. %pkg_completion -bz %prep -%autosetup -n %{name}-%{version} +%autosetup -n %{name}-%{version} -p1 %build # Anyone home?