Click here to go back to the commit logs for sillytavern.

Commit:

---

Hash: acb17c98832a577e1d95158e6bd5d7e01214c78e

Message: 1.11.2

Diff

---

diff --git a/.SRCINFO b/.SRCINFO
index 06cf3b5..7953d09 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,17 +3,24 @@ pkgname = sillytavern
 pkgbase = sillytavern
 pkgdesc = Multy-API LLM frontend
 pkgrel = 0
-pkgver = 1.11.1
+pkgver = 1.11.2
 url = https://docs.sillytavern.app/
 arch = all
-depends = nodejs
 depends = unionfs-fuse
 license = AGPL3
-makedepends = npm
-source = sillytavern-1.11.1.tar.gz::https://github.com/SillyTavern/SillyTavern/archive/refs/tags/1.11.1.tar.gz
+optdepends = nodejs>=18.0.0
+optdepends = nvm
+source = sillytavern-1.11.2.tar.gz::https://github.com/SillyTavern/SillyTavern/archive/refs/tags/1.11.2.tar.gz
 source = sillytavern-wrapper.sh
 source = sillytavern.desktop
-b2sums = 43414ab5e5f0e15dfda7fb8dc8f9d7d482c8655a698248d0994b960ae893829b645118ebc2abf0fe445c81cfd02fb68cc7347b2403a8b26084fa007e3d5eca8c
-b2sums = 52c62b080c51cc47062bca000e270ac97bd1e1b2eb677e7a035e05a966210d982b908c5dcf1e85f0db7736968aed9435632e684ead0f916c8ac349c7a249cd6f
+b2sums = 5738d49fc11ce6ed1f170324e096f96c90737fbff0df2f367dd06e68802a32ca1c8d40d78b430935948ddf2c76a82f96a694461d384e2bf53e5d7f8fb8972769
+b2sums = daf3fb9d70c5155b8b14eae1d6efd6dee93874e3628666023cfc264a657a2c5af8bd643744123a85b7fe5122eb5313977cccb649fe8e2ce69cda3f701b1677f1
 b2sums = 160572cef639c048310380659d95c7adb277c7a9959c3c617f3d5640585d16bc0e25b90fb12182da43158a4e24cf557330a9246fb3acb881d9565530deaff457
-makedepends = npm
+optdepends = nodejs>=18.0.0
+optdepends = nvm
+optmakedepends = nodejs>=18.0.0: install nodejs from the repo
+optmakedepends = npm: needed with distro repo nodejs
+optmakedepends = nvm: install several versions of nodejs in parallel
+optmakedepends = nodejs>=18.0.0: install nodejs from the repo
+optmakedepends = npm: needed with distro repo nodejs
+optmakedepends = nvm: install several versions of nodejs in parallel
diff --git a/PKGBUILD b/PKGBUILD
index f4c689a..d0c6d84 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,41 @@
 # Maintainer: exponential <echo ZXhwb25lbnRpYWxtYXRyaXhAcHJvdG9ubWFpbC5jb20K | base64 -d>
 
-# Uncomment or export in your build environment, to use
-# the central cache instead of the local one
+# Uncomment or export in your build environment,
+# to use the central cache instead of the local one
 #_LOCALCACHE=0
 pkgname=sillytavern
 _pkgname=SillyTavern
-pkgver=1.11.1
+pkgver=1.11.2
+_nodeminver=18.0.0
 pkgrel=0
 pkgdesc="Multy-API LLM frontend"
+# actually onnxruntime-node is amd64 and arm64
 arch=("all")
 url="https://docs.sillytavern.app/"
 license=('AGPL3')
-makedepends=('npm')
-depends=('nodejs' 'unionfs-fuse')
+depends=('unionfs-fuse')
+# many ways to install nodejs
+optmakedepends=("nodejs>=${_nodeminver}: install nodejs from the repo"
+                'npm: needed with distro repo nodejs'
+                'nvm: install several versions of nodejs in parallel')
+optdepends=("nodejs>=${_nodeminver}"
+            'nvm')
 source=("${pkgname}-$pkgver.tar.gz::https://github.com/SillyTavern/SillyTavern/archive/refs/tags/${pkgver}.tar.gz"
         "${pkgname}-wrapper.sh"
         "${pkgname}.desktop")
-b2sums=('43414ab5e5f0e15dfda7fb8dc8f9d7d482c8655a698248d0994b960ae893829b645118ebc2abf0fe445c81cfd02fb68cc7347b2403a8b26084fa007e3d5eca8c'
-        '52c62b080c51cc47062bca000e270ac97bd1e1b2eb677e7a035e05a966210d982b908c5dcf1e85f0db7736968aed9435632e684ead0f916c8ac349c7a249cd6f'
+b2sums=('5738d49fc11ce6ed1f170324e096f96c90737fbff0df2f367dd06e68802a32ca1c8d40d78b430935948ddf2c76a82f96a694461d384e2bf53e5d7f8fb8972769'
+        'daf3fb9d70c5155b8b14eae1d6efd6dee93874e3628666023cfc264a657a2c5af8bd643744123a85b7fe5122eb5313977cccb649fe8e2ce69cda3f701b1677f1'
         '160572cef639c048310380659d95c7adb277c7a9959c3c617f3d5640585d16bc0e25b90fb12182da43158a4e24cf557330a9246fb3acb881d9565530deaff457')
 
 prepare() {
   cd "$srcdir/${_pkgname}-$pkgver"
   # Download the nodejs libs in local PKGBUILD cache (or in the general cache)
   [ -z "$_LOCALCACHE" ] && npm i --no-audit --cache "${startdir}/${pkgname}-npm-cache" || npm i --no-audit
+  # readme
+  mv .github/readme* .
   # Cleanup
-  rm -Rf *.sh *.bat replit.nix Dockerfile docker package-lock.json post-install.js
+  rm -Rf *.sh *.bat replit.nix Dockerfile docker package-lock.json post-install.js .*
+  rm -Rf node_modules/onnxruntime-node/bin/napi-v3/{darwin,win32}
 }
 
 package() {
@@ -34,13 +44,14 @@ package() {
   _LIBPREFIX="/usr/lib/${pkgname}"
   # Creating Directories
   install -dm755 $pkgdir/usr/{bin,share/{${pkgname},doc/${pkgname},applications,icons/hicolor/72x72/apps},lib/${pkgname}}
+  # doc
+  ln -s "${_SHAREPREFIX}/LICENSE" "$pkgdir/usr/share/doc/${pkgname}/license"
+  ln -s "${_SHAREPREFIX}/SECURITY.md" "$pkgdir/usr/share/doc/${pkgname}/security"
+  mv readme* "$pkgdir/usr/share/doc/${pkgname}/"
   # Install
   install -Dm755 "$srcdir/${pkgname}-wrapper.sh" -v "$pkgdir/usr/bin/${pkgname}"
   mv "$srcdir/${_pkgname}-$pkgver/node_modules" "$pkgdir${_LIBPREFIX}"
   mv "$srcdir/${_pkgname}-$pkgver/"* "$pkgdir${_SHAREPREFIX}"
-  # doc
-  ln -s "${_SHAREPREFIX}/LICENSE" "$pkgdir/usr/share/doc/${pkgname}/license"
-  ln -s "${_SHAREPREFIX}/SECURITY.md" "$pkgdir/usr/share/doc/${pkgname}/security"
   # Icon and desktop file
   ln -s "${_SHAREPREFIX}/public/img/apple-icon-72x72.png" "$pkgdir/usr/share/icons/hicolor/72x72/apps/${pkgname}.png"
   install -Dm644 "$srcdir/${pkgname}.desktop" -vt "$pkgdir/usr/share/applications"
diff --git a/sillytavern-wrapper.sh b/sillytavern-wrapper.sh
index fa067e3..2e5c08a 100644
--- a/sillytavern-wrapper.sh
+++ b/sillytavern-wrapper.sh
@@ -4,7 +4,7 @@ _name="sillytavern"
 _SHAREPREFIX="/usr/share/${_name}"
 _LIBPREFIX="/usr/lib/${_name}"
 _config_dir="${XDG_CONFIG_HOME:-$HOME/.config}/$_name"
-export NODE_PATH="$NODE_PATH:/usr/lib/${_LIBPREFIX}"
+export NODE_PATH="$NODE_PATH:${_LIBPREFIX}"
 
 fusecleanup()
 {
@@ -24,4 +24,5 @@ printf "\33[2K\r\033[1;33m%s\033[0m\n\33[2K\r\033[1;33m%s\033[0m\n" "If  automat
 echo "Entering SillyTavern..."
 cd "$_config_dir/opt"
 echo "Starting SillyTavern..."
+
 node ./server.js || fusecleanup