Fixed NVM Init

Had to follow a wiki-entry in the Arch Wiki to get NVM to init correctly
for building.

1 files changed, 22 insertions, 5 deletions

diff --git a/PKGBUILD b/PKGBUILD
index ad03383d101a..62b439e1f058 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 pkgname=fchat-rising-git
 _pkgname=fchat-rising
 pkgver=1.15.1
-pkgrel=4
+pkgrel=5
 pkgdesc="The F-Chat 3.0 client from F-List modifed by MrStallion. Uses a system-wide electron instead of the built in."
 arch=('x86_64')
 url="https://github.com/mrstallion/fchat-rising"
@@ -16,7 +16,7 @@ depends=(
     'libxtst'
     'libsecret'
 )
-makedepends=('yarn' 'nvm' 'node-gyp' 'python2')
+makedepends=('yarn' 'npm' 'nvm' 'node-gyp' 'python2')
 provides=('fchat-3.0')
 source=(
     'fchat::git+https://github.com/mrstallion/fchat-rising#tag=v1.15.1'
@@ -24,14 +24,31 @@ source=(
 )
 sha256sums=('SKIP' 'eaa27f1eb8bd228e9bd11a1cd068f30b3129abce85ab9f275de34dbf60ba8fba')
 
+_ensure_local_nvm() {
+    # https://wiki.archlinux.org/title/Node.js_package_guidelines#Using_nvm
+    # let's be sure we are starting clean
+    which nvm >/dev/null 2>&1 && nvm deactivate && nvm unload
+    export NVM_DIR="${srcdir}/.nvm"
+
+    # The init script returns 3 if version specified
+    # in ./.nvrc is not (yet) installed in $NVM_DIR
+    # but nvm itself still gets loaded ok
+    source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
+}
+
 prepare() {
-    source /usr/share/nvm/init-nvm.sh
+    echo "Init NVM..."
+    _ensure_local_nvm
+    echo "Install Node v14..."
     nvm install v14
+    echo "Enabling Node v14..."
     nvm use v14
 }
 
 build() {
-    source /usr/share/nvm/init-nvm.sh
+    echo "Init NVM..."
+    _ensure_local_nvm
+    echo "Using Node v14..."
     nvm use v14
     cd $srcdir/fchat/
     HOME="$srcdir/.node" yarn install
@@ -55,7 +72,7 @@ package() {
     echo "#!/bin/sh" >> "$srcdir"/$_pkgname
     # F-Chat needs to executed within it's directory
     echo "cd /usr/lib/$_pkgname" >> "$srcdir"/$_pkgname
-    echo "exec electron13 ./ \$@" >> "$srcdir"/$_pkgname
+    echo "exec /usr/bin/electron13 ./ \$@" >> "$srcdir"/$_pkgname
     install -d "$pkgdir"/usr/{bin,share/{pixmaps,applications}}
     install -Dm 755 "$srcdir"/$_pkgname "$pkgdir"/usr/bin/$_pkgname
     cp "$srcdir"/fchat/electron/build/icon.png "$pkgdir"/usr/share/pixmaps/$_pkgname.png