Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make .nvmrc more versatile/modular #3235

Draft
wants to merge 11 commits into
base: master
Choose a base branch
from
Draft

Make .nvmrc more versatile/modular #3235

Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
db466ab
[New] Allow `nvm_find_nvmrc` to use custom path and name
victormihalache Nov 21, 2023
fb11d3c
[New] `install`: Allow use of `--config`
victormihalache Nov 21, 2023
73929d9
[New] Allow all commands that require `.nvmrc` to use the `--config` …
victormihalache Nov 21, 2023
4e1fa57
[Format] Remove trailing whitespaces
victormihalache Nov 21, 2023
8a2284e
[Format] Add double quotes to pass CI
victormihalache Nov 21, 2023
8a1f073
Merge branch 'nvm-sh:master' into issue3234
victormihalache Jan 7, 2024
38ff719
Merge branch 'nvm-sh:master' into issue3234
victormihalache Jan 29, 2024
0f655cd
Merge branch 'nvm-sh:master' into issue3234
victormihalache Mar 8, 2024
a23b262
Merge branch 'nvm-sh:master' into issue3234
victormihalache May 25, 2024
cb8bb8d
Merge branch 'nvm-sh:master' into issue3234
victormihalache Jun 6, 2024
ae75e71
Merge branch 'nvm-sh:master' into issue3234
victormihalache Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 42 additions & 10 deletions nvm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,17 +461,24 @@ nvm_find_up() {

nvm_find_nvmrc() {
local dir
dir="$(nvm_find_up '.nvmrc')"
if [ -e "${dir}/.nvmrc" ]; then
nvm_echo "${dir}/.nvmrc"
local rcfile="${1:-.nvmrc}"
dir="$(nvm_find_up "${rcfile}")"
if [ -e "${dir}/${rcfile}" ]; then
nvm_echo "${dir}/${rcfile}"
fi
}

# Obtain nvm version from rc file
nvm_rc_version() {
export NVM_RC_VERSION=''
local NVMRC_PATH
NVMRC_PATH="$(nvm_find_nvmrc)"

if [ -n "$1" ]; then
NVMRC_PATH="$(nvm_find_nvmrc "$1")"
else
NVMRC_PATH="$(nvm_find_nvmrc)"
fi

if [ ! -e "${NVMRC_PATH}" ]; then
if [ "${NVM_SILENT:-0}" -ne 1 ]; then
nvm_err "No .nvmrc file found"
Expand Down Expand Up @@ -3130,6 +3137,7 @@ nvm() {
local PROVIDED_REINSTALL_PACKAGES_FROM
local REINSTALL_PACKAGES_FROM
local SKIP_DEFAULT_PACKAGES
local NVM_RC_PATH

while [ $# -ne 0 ]; do
case "$1" in
Expand Down Expand Up @@ -3224,6 +3232,10 @@ nvm() {
SKIP_DEFAULT_PACKAGES=true
shift
;;
--config=*)
NVM_RC_PATH="${1#--config=}"
shift
;;
*)
break # stop parsing args
;;
Expand All @@ -3245,7 +3257,7 @@ nvm() {
shift
fi
else
nvm_rc_version
nvm_rc_version "$NVM_RC_PATH"
if [ $version_not_provided -eq 1 ] && [ -z "${NVM_RC_VERSION}" ]; then
unset NVM_RC_VERSION
>&2 nvm --help
Expand Down Expand Up @@ -3600,6 +3612,7 @@ nvm() {
local NVM_LTS
local IS_VERSION_FROM_NVMRC
IS_VERSION_FROM_NVMRC=0
local NVM_RC_PATH

while [ $# -ne 0 ]; do
case "$1" in
Expand All @@ -3611,6 +3624,10 @@ nvm() {
--) ;;
--lts) NVM_LTS='*' ;;
--lts=*) NVM_LTS="${1##--lts=}" ;;
--config=*)
NVM_RC_PATH="${1#--config=}"
shift
;;
--*) ;;
*)
if [ -n "${1-}" ]; then
Expand All @@ -3624,7 +3641,7 @@ nvm() {
if [ -n "${NVM_LTS-}" ]; then
VERSION="$(nvm_match_version "lts/${NVM_LTS:-*}")"
elif [ -z "${PROVIDED_VERSION-}" ]; then
NVM_SILENT="${NVM_SILENT:-0}" nvm_rc_version
NVM_SILENT="${NVM_SILENT:-0}" nvm_rc_version "$NVM_RC_PATH"
if [ -n "${NVM_RC_VERSION-}" ]; then
PROVIDED_VERSION="${NVM_RC_VERSION}"
IS_VERSION_FROM_NVMRC=1
Expand Down Expand Up @@ -3734,6 +3751,7 @@ nvm() {
local NVM_SILENT
local NVM_SILENT_ARG
local NVM_LTS
local NVM_RC_PATH
while [ $# -gt 0 ]; do
case "$1" in
--silent)
Expand All @@ -3743,6 +3761,10 @@ nvm() {
;;
--lts) NVM_LTS='*' ; shift ;;
--lts=*) NVM_LTS="${1##--lts=}" ; shift ;;
--config=*)
NVM_RC_PATH="${1#--config=}"
shift
;;
*)
if [ -n "$1" ]; then
break
Expand All @@ -3754,7 +3776,7 @@ nvm() {
done

if [ $# -lt 1 ] && [ -z "${NVM_LTS-}" ]; then
NVM_SILENT="${NVM_SILENT:-0}" nvm_rc_version && has_checked_nvmrc=1
NVM_SILENT="${NVM_SILENT:-0}" nvm_rc_version "$NVM_RC_PATH" && has_checked_nvmrc=1
if [ -n "${NVM_RC_VERSION-}" ]; then
VERSION="$(nvm_version "${NVM_RC_VERSION-}")" ||:
fi
Expand All @@ -3772,7 +3794,7 @@ nvm() {
if [ "_${VERSION:-N/A}" = '_N/A' ] && ! nvm_is_valid_version "${provided_version}"; then
provided_version=''
if [ $has_checked_nvmrc -ne 1 ]; then
NVM_SILENT="${NVM_SILENT:-0}" nvm_rc_version && has_checked_nvmrc=1
NVM_SILENT="${NVM_SILENT:-0}" nvm_rc_version "$NVM_RC_PATH" && has_checked_nvmrc=1
fi
provided_version="${NVM_RC_VERSION}"
IS_VERSION_FROM_NVMRC=1
Expand Down Expand Up @@ -3810,11 +3832,16 @@ nvm() {
"exec")
local NVM_SILENT
local NVM_LTS
local NVM_RC_PATH
while [ $# -gt 0 ]; do
case "$1" in
--silent) NVM_SILENT=1 ; shift ;;
--lts) NVM_LTS='*' ; shift ;;
--lts=*) NVM_LTS="${1##--lts=}" ; shift ;;
--config=*)
NVM_RC_PATH="${1#--config=}"
shift
;;
--) break ;;
--*)
nvm_err "Unsupported option \"$1\"."
Expand All @@ -3838,7 +3865,7 @@ nvm() {
elif [ -n "${provided_version}" ]; then
VERSION="$(nvm_version "${provided_version}")" ||:
if [ "_${VERSION}" = '_N/A' ] && ! nvm_is_valid_version "${provided_version}"; then
NVM_SILENT="${NVM_SILENT:-0}" nvm_rc_version && has_checked_nvmrc=1
NVM_SILENT="${NVM_SILENT:-0}" nvm_rc_version "$NVM_RC_PATH" && has_checked_nvmrc=1
provided_version="${NVM_RC_VERSION}"
unset NVM_RC_VERSION
VERSION="$(nvm_version "${provided_version}")" ||:
Expand Down Expand Up @@ -3962,16 +3989,21 @@ nvm() {
"which")
local NVM_SILENT
local provided_version
local NVM_RC_PATH
while [ $# -ne 0 ]; do
case "${1}" in
--silent) NVM_SILENT=1 ;;
--config=*)
NVM_RC_PATH="${1#--config=}"
shift
;;
--) ;;
*) provided_version="${1-}" ;;
esac
shift
done
if [ -z "${provided_version-}" ]; then
NVM_SILENT="${NVM_SILENT:-0}" nvm_rc_version
NVM_SILENT="${NVM_SILENT:-0}" nvm_rc_version "$NVM_RC_PATH"
if [ -n "${NVM_RC_VERSION}" ]; then
provided_version="${NVM_RC_VERSION}"
VERSION=$(nvm_version "${NVM_RC_VERSION}") ||:
Expand Down
Loading