Updated for 1.18.1

1 files changed, 13 insertions, 14 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 62b439e1f058..e6c55809ea44 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Carlen White <whitersuburban@gmail.com>
 pkgname=fchat-rising-git
 _pkgname=fchat-rising
-pkgver=1.15.1
-pkgrel=5
+pkgver=1.18.1
+pkgrel=1
 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"
 license=('MIT')
 depends=(
-    'electron13'
+    'electron17'
     'libappindicator-gtk3'
     'libindicator-gtk3'
     'libnotify'
@@ -19,7 +19,7 @@ depends=(
 makedepends=('yarn' 'npm' 'nvm' 'node-gyp' 'python2')
 provides=('fchat-3.0')
 source=(
-    'fchat::git+https://github.com/mrstallion/fchat-rising#tag=v1.15.1'
+    'fchat::git+https://github.com/mrstallion/fchat-rising#tag=v1.18.1'
     'local://fchat.desktop'
 )
 sha256sums=('SKIP' 'eaa27f1eb8bd228e9bd11a1cd068f30b3129abce85ab9f275de34dbf60ba8fba')
@@ -39,23 +39,23 @@ _ensure_local_nvm() {
 prepare() {
     echo "Init NVM..."
     _ensure_local_nvm
-    echo "Install Node v14..."
-    nvm install v14
-    echo "Enabling Node v14..."
-    nvm use v14
+    echo "Install Node v16..."
+    nvm install v16
+    echo "Enabling Node v16..."
+    nvm use v16
 }
 
 build() {
     echo "Init NVM..."
     _ensure_local_nvm
-    echo "Using Node v14..."
-    nvm use v14
+    echo "Using Node v16..."
+    nvm use v16
     cd $srcdir/fchat/
     HOME="$srcdir/.node" yarn install
     cd $srcdir/fchat/electron
     HOME="$srcdir/.node" yarn build:dist
     export SKIP_INSTALLER=TRUE
-    node ./pack
+    HOME="$srcdir/.node" yarn run pack
     sed -i "s|Exec=.*|Exec=/usr/bin/$_pkgname|" "$srcdir"/fchat.desktop
     sed -i "s|Icon=.*|Icon=/usr/share/pixmaps/$_pkgname.png|" "$srcdir"/fchat.desktop
 }
@@ -63,16 +63,15 @@ build() {
 package() {
     export SKIP_INSTALLER=TRUE
     source /usr/share/nvm/init-nvm.sh
-    nvm use v14
+    nvm use v16
     cd $srcdir/fchat/electron
-    HOME="$srcdir/.node" yarn run pack
     install -d "$pkgdir"/usr/lib/$_pkgname
     cp -r "$srcdir"/fchat/electron/dist/F-Chat-linux-x64/resources/app/* "$pkgdir"/usr/lib/$_pkgname
     rm "$srcdir"/$_pkgname || true
     echo "#!/bin/sh" >> "$srcdir"/$_pkgname
     # F-Chat needs to executed within it's directory
     echo "cd /usr/lib/$_pkgname" >> "$srcdir"/$_pkgname
-    echo "exec /usr/bin/electron13 ./ \$@" >> "$srcdir"/$_pkgname
+    echo "exec /usr/bin/electron17 ./ \$@" >> "$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