273345896
/
nvm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Fix] bypass aliased `cd` in a few places. 

Fixes #1284.
Jordan Harband 2016-11-03 10:08:24 -07:00
parent a458ccbb87
commit 942e9ab1f5
No known key found for this signature in database
GPG Key ID: 64A196AEE0916D55
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nvm.sh
View File

@ -22,6 +22,11 @@ nvm_echo() {
} }
} }
nvm_cd() {
# shellcheck disable=SC1001,SC2164
\cd "$@"
}
nvm_err() { nvm_err() {
>&2 nvm_echo "$@" >&2 nvm_echo "$@"
} }
@ -115,7 +120,7 @@ if [ -z "${NVM_DIR-}" ]; then
NVM_SCRIPT_SOURCE="${BASH_SOURCE[0]}" NVM_SCRIPT_SOURCE="${BASH_SOURCE[0]}"
fi fi
# shellcheck disable=SC1001 # shellcheck disable=SC1001
NVM_DIR="$(cd ${NVM_CD_FLAGS} "$(dirname "${NVM_SCRIPT_SOURCE:-$0}")" > /dev/null && \pwd)" NVM_DIR="$(nvm_cd ${NVM_CD_FLAGS} "$(dirname "${NVM_SCRIPT_SOURCE:-$0}")" > /dev/null && \pwd)"
export NVM_DIR export NVM_DIR
fi fi
unset NVM_SCRIPT_SOURCE 2> /dev/null unset NVM_SCRIPT_SOURCE 2> /dev/null
@ -1845,7 +1850,7 @@ nvm_install_source() {
command mkdir -p "${TMPDIR}" && \ command mkdir -p "${TMPDIR}" && \
command tar -x${tar_compression_flag}f "${TARBALL}" -C "${TMPDIR}" --strip-components 1 && \ command tar -x${tar_compression_flag}f "${TARBALL}" -C "${TMPDIR}" --strip-components 1 && \
VERSION_PATH="$(nvm_version_path "${PREFIXED_VERSION}")" && \ VERSION_PATH="$(nvm_version_path "${PREFIXED_VERSION}")" && \
cd "${TMPDIR}" && \ nvm_cd "${TMPDIR}" && \
./configure --prefix="${VERSION_PATH}" $ADDITIONAL_PARAMETERS && \ ./configure --prefix="${VERSION_PATH}" $ADDITIONAL_PARAMETERS && \
$make -j "${NVM_MAKE_JOBS}" ${MAKE_CXX-} && \ $make -j "${NVM_MAKE_JOBS}" ${MAKE_CXX-} && \
command rm -f "${VERSION_PATH}" 2>/dev/null && \ command rm -f "${VERSION_PATH}" 2>/dev/null && \
@ -3022,7 +3027,7 @@ nvm() {
for LINK in $LINKS; do for LINK in $LINKS; do
set +f; unset IFS # restore variable expansion set +f; unset IFS # restore variable expansion
if [ -n "$LINK" ]; then if [ -n "$LINK" ]; then
(cd "$LINK" && npm link) (nvm_cd "$LINK" && npm link)
fi fi
done done
set +f; unset IFS # restore variable expansion in case $LINKS was empty set +f; unset IFS # restore variable expansion in case $LINKS was empty