summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Wadley2016-08-28 16:19:42 -0500
committerTom Wadley2016-08-28 16:19:42 -0500
commit724f3c40767d900e884918c791a0260ae9953f82 (patch)
tree6adc040940b31e235d7e7bef80355a17eae3bd67
parent2a8c783ab8c216d6ca46572cf642f0757e5a7805 (diff)
downloadaur-724f3c40767d900e884918c791a0260ae9953f82.tar.gz
Convenience script: only set NVM_DIR if not already set
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD4
-rw-r--r--init-nvm.sh2
3 files changed, 6 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 23fff953e45..9121e7b6c88 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue Aug 23 22:08:01 UTC 2016
+# Sun Aug 28 21:16:47 UTC 2016
pkgbase = nvm
pkgdesc = Node Version Manager - Simple bash script to manage multiple active node.js versions
pkgver = 0.31.6
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/creationix/nvm
install = nvm.install
arch = any
@@ -13,7 +13,7 @@ pkgbase = nvm
source = init-nvm.sh
source = install-nvm-exec
md5sums = 855ccfc7cb1e20aff9f2667ea85e1b19
- md5sums = 1baa599ca9a724a42aff2bafb23a76ad
+ md5sums = b75a15a2cbe04e6203ebaf6103e90926
md5sums = 8f3c5b82f09636e9cf82d45d68c39cc6
pkgname = nvm
diff --git a/PKGBUILD b/PKGBUILD
index ac3d1bff882..dd682ac9a3a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=nvm
pkgver=0.31.6
-pkgrel=1
+pkgrel=2
pkgdesc="Node Version Manager - Simple bash script to manage multiple active node.js versions"
url="https://github.com/creationix/nvm"
arch=('any')
@@ -13,7 +13,7 @@ source=("https://github.com/creationix/nvm/archive/v${pkgver}.zip"
"init-nvm.sh"
"install-nvm-exec")
md5sums=('855ccfc7cb1e20aff9f2667ea85e1b19'
- '1baa599ca9a724a42aff2bafb23a76ad'
+ 'b75a15a2cbe04e6203ebaf6103e90926'
'8f3c5b82f09636e9cf82d45d68c39cc6')
build() {
diff --git a/init-nvm.sh b/init-nvm.sh
index 90da3964fdf..3ef3fbf57d1 100644
--- a/init-nvm.sh
+++ b/init-nvm.sh
@@ -1,4 +1,4 @@
-export NVM_DIR="$HOME/.nvm"
+[ -z "$NVM_DIR" ] && export NVM_DIR="$HOME/.nvm"
source /usr/share/nvm/nvm.sh
source /usr/share/nvm/bash_completion
source /usr/share/nvm/install-nvm-exec