Skip to content

Commit 2e7fb25

Browse files
committed
nvm: update to 0.39.7
- Drop `hash -r' in as AOSC OS prohibits command hashing by default. - Lint build script to make it more readable.
1 parent ffbcccc commit 2e7fb25

File tree

4 files changed

+47
-12
lines changed

4 files changed

+47
-12
lines changed

lang-js/nvm/autobuild/build

+12-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1-
abinfo "Installing nvm.sh, bash completion and doc..."
2-
install -Dvm644 "$SRCDIR"/nvm.sh "$PKGDIR"/usr/share/nvm/nvm.sh
3-
install -Dvm644 "$SRCDIR"/bash_completion "$PKGDIR"/usr/share/bash-completion/completions/nvm
4-
install -Dvm644 "$SRCDIR"/*.md -t "$PKGDIR"/usr/share/doc/nvm/
1+
abinfo "Installing nvm.sh, bash completion, and documentation ..."
2+
install -Dvm644 "$SRCDIR"/nvm.sh \
3+
"$PKGDIR"/usr/share/nvm/nvm.sh
4+
install -Dvm644 "$SRCDIR"/bash_completion \
5+
"$PKGDIR"/usr/share/bash-completion/completions/nvm
6+
install -Dvm644 "$SRCDIR"/*.md \
7+
-t "$PKGDIR"/usr/share/doc/nvm/
58

6-
abinfo "Creating symlink to nvm.sh in bashrc.d and zshrc.d"
9+
abinfo "Creating symlink to nvm.sh in bashrc.d and zshrc.d ..."
710
mkdir -pv "$PKGDIR"/etc/{bashrc.d,zsh/zshrc.d}
8-
ln -vs ../../usr/share/nvm/nvm.sh "$PKGDIR"/etc/bashrc.d/30-nvm
9-
ln -vs ../../../usr/share/nvm/nvm.sh "$PKGDIR"/etc/zsh/zshrc.d/30-nvm
11+
ln -vs ../../usr/share/nvm/nvm.sh \
12+
"$PKGDIR"/etc/bashrc.d/30-nvm
13+
ln -vs ../../../usr/share/nvm/nvm.sh \
14+
"$PKGDIR"/etc/zsh/zshrc.d/30-nvm

lang-js/nvm/autobuild/defines

-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@ PKGDES="NodeJS Version Manager"
44
PKGDEP="bash wget curl"
55

66
ABHOST=noarch
7-
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
From a7185ed2ae440717e29cde5d923b62d621be03f9 Mon Sep 17 00:00:00 2001
2+
From: Mingcong Bai <[email protected]>
3+
Date: Sat, 6 Jan 2024 22:53:21 -0800
4+
Subject: [PATCH] nvm.sh: drop hash -r
5+
6+
---
7+
nvm.sh | 2 --
8+
1 file changed, 2 deletions(-)
9+
10+
diff --git a/nvm.sh b/nvm.sh
11+
index 2e4378f..cb4dda5 100644
12+
--- a/nvm.sh
13+
+++ b/nvm.sh
14+
@@ -3565,7 +3565,6 @@ nvm() {
15+
fi
16+
else
17+
export PATH="${NEWPATH}"
18+
- \hash -r
19+
if [ "${NVM_SILENT:-0}" -ne 1 ]; then
20+
nvm_echo "${NVM_DIR}/*/bin removed from \${PATH}"
21+
fi
22+
@@ -3697,7 +3696,6 @@ nvm() {
23+
export MANPATH
24+
fi
25+
export PATH
26+
- \hash -r
27+
export NVM_BIN="${NVM_VERSION_DIR}/bin"
28+
export NVM_INC="${NVM_VERSION_DIR}/include/node"
29+
if [ "${NVM_SYMLINK_CURRENT-}" = true ]; then
30+
--
31+
2.39.1
32+

lang-js/nvm/spec

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
VER=0.37.0
2-
REL=2
3-
SRCS="tbl::https://github.com/creationix/nvm/archive/v$VER.tar.gz"
4-
CHKSUMS="sha256::c22fb788a64ed48f6f44ebd7ba6c796471a1413eee085adfb7493b553ae05a09"
1+
VER=0.39.7
2+
SRCS="git::commit=tags/v$VER::https://github.com/creationix/nvm"
3+
CHKSUMS="SKIP"
54
CHKUPDATE="anitya::id=229016"

0 commit comments

Comments
 (0)