Bump to v0.6.4

12 files changed, 38 insertions, 127 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6e40b1b86a77..80868566cdd2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = tachidesk
 	pkgdesc = A free and open source manga reader that runs extensions built for Tachiyomi
-	pkgver = 0.6.3_r1100
-	pkgrel = 2
+	pkgver = 0.6.4_r1113
+	pkgrel = 1
 	url = https://github.com/Suwayomi/Tachidesk-Server
 	arch = any
 	license = MPL2
@@ -9,27 +9,10 @@ pkgbase = tachidesk
 	optdepends = electron: running in Electron
 	provides = tachidesk
 	provides = tachidesk-server
-	conflicts = tachidesk-preview
-	noextract = Tachidesk-Server-v0.6.3-r1100.jar
-	source = https://github.com/Suwayomi/Tachidesk-Server/releases/download/v0.6.3/Tachidesk-Server-v0.6.3-r1100.jar
-	source = tachidesk-server.conf
-	source = tachidesk-server.service
-	source = tachidesk-server.sysusers
-	source = tachidesk-server.tmpfiles
-	source = tachidesk-server.desktop
-	source = tachidesk-server.png
-	source = tachidesk-server-browser-launcher.sh
-	source = tachidesk-server-debug-launcher.sh
-	source = tachidesk-server-electron-launcher.sh
-	sha256sums = 533afe39862d2af2826b9c8b5e31653b63ffd13c3fc20512e33814caa39eb5ca
-	sha256sums = f0645eb6855fcb854dd42c000ad0ca1895b67017234d79a93cefb9b90e9b3ef6
-	sha256sums = b8ae15e5dec2d20bedf4827b56a65d48b0155bd86a21147604fb714ee4208c59
-	sha256sums = d968233df273640b51cd3daf61bab809df6fb844bee92f4f5887c09d95c482aa
-	sha256sums = 715b5ad6ecdcab24f7a7663c3b606654a6c7bd6323540d29ad1440b0116e046d
-	sha256sums = 7ec4e0722d0312384672ccd01d939cce0fe356cf16d23f3473e7502cdddbccd3
-	sha256sums = 7528715b5b8d8360a9fd7dc096b51fd52bf3da671167e224b6cb637437fc4831
-	sha256sums = 1a075de252d4d1e4a025e26d379985995893e03d2ac9182ab8a48624b7076470
-	sha256sums = 39636e9a235e129312cbea43ffdaa3739fa24737e1d6b3388b354d0219272f8b
-	sha256sums = 62ad320c6cc48a8adb2013dfa9f8bab43b1e1401dc0c36ce53bc0b583fccdd21
+	noextract = Tachidesk-Server-v0.6.4-r1113.jar
+	source = https://github.com/Suwayomi/Tachidesk-Server/releases/download/v0.6.4/Tachidesk-Server-v0.6.4-r1113.jar
+	source = https://github.com/Suwayomi/Tachidesk-Server/releases/download/v0.6.4/Tachidesk-Server-v0.6.4-r1113-linux-assets.tar.gz
+	sha256sums = 3a4421032bd4c1046cc3c91af72bae11463e7c86fc4f2930b77abee7cb762b97
+	sha256sums = 2f00771683908d3c24d49ff78f184f60210d5c0e7dd44a67e35c6b58c95c49f1
 
 pkgname = tachidesk
diff --git a/.gitignore b/.gitignore
index 7e7afdf49771..e030f60d6740 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 src/
 pkg/
-*.zst
+*.tar.zst
+*.tar.gz
 *.jar
diff --git a/PKGBUILD b/PKGBUILD
index c0d085a98e8a..2977de790c1b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,53 +2,40 @@
 # Maintainer: Mahor1221 <mahor1221 at pm dot me>
 
 pkgname=tachidesk
-pkgver=0.6.3_r1100
-pkgrel=2
-__pkgname=tachidesk-server
-__PkgName=Tachidesk-Server
-__pkgver="${pkgver%_*}"
-__revnum="${pkgver#*_r}"
+_pkgname=tachidesk-server
+_PkgName=Tachidesk-Server
+pkgver=0.6.4_r1113
+pkgrel=1
+_pkgver="${pkgver%_*}"
+_revnum="${pkgver#*_r}"
 pkgdesc="A free and open source manga reader that runs extensions built for Tachiyomi"
 arch=("any")
-url="https://github.com/Suwayomi/$__PkgName"
+url="https://github.com/Suwayomi/$_PkgName"
 license=("MPL2")
 depends=("java-runtime>=8")
 optdepends=("electron: running in Electron")
-provides=("$pkgname" "$__pkgname")
-conflicts=("$pkgname-preview")
-__jar=$__PkgName-v$__pkgver-r$__revnum.jar
-source=("$url/releases/download/v$__pkgver/$__jar"
-        "$__pkgname.conf"
-        "$__pkgname.service"
-        "$__pkgname.sysusers"
-        "$__pkgname.tmpfiles"
-        "$__pkgname.desktop"
-        "$__pkgname.png"
-        "$__pkgname-browser-launcher.sh"
-        "$__pkgname-debug-launcher.sh"
-        "$__pkgname-electron-launcher.sh")
-sha256sums=('533afe39862d2af2826b9c8b5e31653b63ffd13c3fc20512e33814caa39eb5ca'
-            'f0645eb6855fcb854dd42c000ad0ca1895b67017234d79a93cefb9b90e9b3ef6'
-            'b8ae15e5dec2d20bedf4827b56a65d48b0155bd86a21147604fb714ee4208c59'
-            'd968233df273640b51cd3daf61bab809df6fb844bee92f4f5887c09d95c482aa'
-            '715b5ad6ecdcab24f7a7663c3b606654a6c7bd6323540d29ad1440b0116e046d'
-            '7ec4e0722d0312384672ccd01d939cce0fe356cf16d23f3473e7502cdddbccd3'
-            '7528715b5b8d8360a9fd7dc096b51fd52bf3da671167e224b6cb637437fc4831'
-            '1a075de252d4d1e4a025e26d379985995893e03d2ac9182ab8a48624b7076470'
-            '39636e9a235e129312cbea43ffdaa3739fa24737e1d6b3388b354d0219272f8b'
-            '62ad320c6cc48a8adb2013dfa9f8bab43b1e1401dc0c36ce53bc0b583fccdd21')
-noextract=("$__jar")
+provides=("$pkgname" "$_pkgname")
+_jar="$_PkgName-v$_pkgver-r$_revnum.jar"
+_assets="$_PkgName-v$_pkgver-r$_revnum-linux-assets"
+source=("$url/releases/download/v$_pkgver/$_jar"
+  "$url/releases/download/v$_pkgver/$_assets.tar.gz")
+noextract=("$_jar")
+sha256sums=('3a4421032bd4c1046cc3c91af72bae11463e7c86fc4f2930b77abee7cb762b97'
+            '2f00771683908d3c24d49ff78f184f60210d5c0e7dd44a67e35c6b58c95c49f1')
 
 package() {
-    install -Dm644 "$srcdir/$__pkgname.conf"                    "$pkgdir/etc/tachidesk/server.conf"
-    install -Dm644 "$srcdir/$__pkgname.service"                 "$pkgdir/usr/lib/systemd/system/$__pkgname.service"
-    install -Dm644 "$srcdir/$__pkgname.sysusers"                "$pkgdir/usr/lib/sysusers.d/$__pkgname.conf"
-    install -Dm644 "$srcdir/$__pkgname.tmpfiles"                "$pkgdir/usr/lib/tmpfiles.d/$__pkgname.conf"
-    install -Dm644 "$srcdir/$__jar"                             "$pkgdir/usr/share/java/$__pkgname/$__pkgname.jar"
-    install -Dm644 "$srcdir/$__pkgname.desktop"                 "$pkgdir/usr/share/applications/$__pkgname.desktop"
-    install -Dm644 "$srcdir/$__pkgname.png"                     "$pkgdir/usr/share/pixmaps/$__pkgname.png"
-    install -Dm755 "$srcdir/$__pkgname-browser-launcher.sh"     "$pkgdir/usr/bin/$__pkgname-browser"
-    install -Dm755 "$srcdir/$__pkgname-debug-launcher.sh"       "$pkgdir/usr/bin/$__pkgname-debug"
-    install -Dm755 "$srcdir/$__pkgname-electron-launcher.sh"    "$pkgdir/usr/bin/$__pkgname-electron"
-    ln -sr  "$pkgdir/usr/bin/$__pkgname-browser"    "$pkgdir/usr/bin/tachidesk" # keep backwards compatibility
+  cd "$srcdir/"
+  install -Dm644 "$_jar"                            "$pkgdir/usr/share/java/$_pkgname/$_PkgName.jar"
+  cd "$srcdir/$_assets/"
+  install -Dm644 "$_pkgname.conf"                   "$pkgdir/etc/tachidesk/server.conf"
+  install -Dm644 "$_pkgname.service"                "$pkgdir/usr/lib/systemd/system/$_pkgname.service"
+  install -Dm644 "$_pkgname.sysusers"               "$pkgdir/usr/lib/sysusers.d/$_pkgname.conf"
+  install -Dm644 "$_pkgname.tmpfiles"               "$pkgdir/usr/lib/tmpfiles.d/$_pkgname.conf"
+  install -Dm644 "$_pkgname.desktop"                "$pkgdir/usr/share/applications/$_pkgname.desktop"
+  install -Dm644 "$_pkgname.png"                    "$pkgdir/usr/share/pixmaps/$_pkgname.png"
+  install -Dm755 "$_pkgname-browser-launcher.sh"    "$pkgdir/usr/bin/$_pkgname-browser"
+  install -Dm755 "$_pkgname-debug-launcher.sh"      "$pkgdir/usr/bin/$_pkgname-debug"
+  install -Dm755 "$_pkgname-electron-launcher.sh"   "$pkgdir/usr/bin/$_pkgname-electron"
+  # keep backwards compatibility
+  ln -sr "$pkgdir/usr/bin/$_pkgname-browser"        "$pkgdir/usr/bin/tachidesk"
 }
diff --git a/tachidesk-server-browser-launcher.sh b/tachidesk-server-browser-launcher.sh
deleted file mode 100644
index 16d63960ffe2..000000000000
--- a/tachidesk-server-browser-launcher.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/java -jar /usr/share/java/tachidesk-server/tachidesk-server.jar
diff --git a/tachidesk-server-debug-launcher.sh b/tachidesk-server-debug-launcher.sh
deleted file mode 100644
index dabd62a0ca7f..000000000000
--- a/tachidesk-server-debug-launcher.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/java -Dsuwayomi.tachidesk.config.server.debugLogsEnabled=true -jar /usr/share/java/tachidesk-server/tachidesk-server.jar
diff --git a/tachidesk-server-electron-launcher.sh b/tachidesk-server-electron-launcher.sh
deleted file mode 100644
index 8d5d52d32e32..000000000000
--- a/tachidesk-server-electron-launcher.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-if [ ! -f /usr/bin/electron ]; then
-	echo "Electron executable was not found! In order to run this launcher, you need Electron installed."
-	echo "You can run 'pacman -S electron' to install the package."
-	exit 1
-fi
-
-exec /usr/bin/java -Dsuwayomi.tachidesk.config.server.webUIInterface=electron -Dsuwayomi.tachidesk.config.server.electronPath=/usr/bin/electron -jar /usr/share/java/tachidesk-server/tachidesk-server.jar
diff --git a/tachidesk-server.conf b/tachidesk-server.conf
deleted file mode 100644
index acc64b005b78..000000000000
--- a/tachidesk-server.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-TACHIDESK_ROOT_DIR="/var/lib/tachidesk"
-
-# Extra arguments passed to the java command
-# The default value disables the system tray icon, and launching a browser on service start.
-JAVA_ARGS=-Dsuwayomi.tachidesk.config.server.initialOpenInBrowserEnabled=false -Dsuwayomi.tachidesk.config.server.systemTrayEnabled=false
diff --git a/tachidesk-server.desktop b/tachidesk-server.desktop
deleted file mode 100644
index deb7e66e6870..000000000000
--- a/tachidesk-server.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Tachidesk-Server
-Comment=Manga Reader
-Exec=/usr/bin/java -jar /usr/share/java/tachidesk-server/tachidesk-server.jar "\\$@"
-Icon=tachidesk-server
-Terminal=false
-Categories=Network;
diff --git a/tachidesk-server.png b/tachidesk-server.png
deleted file mode 100644
index 58aec43d1b17..000000000000
--- a/tachidesk-server.png
+++ /dev/null
diff --git a/tachidesk-server.service b/tachidesk-server.service
deleted file mode 100644
index a72f4c497784..000000000000
--- a/tachidesk-server.service
+++ /dev/null
@@ -1,31 +0,0 @@
-[Unit]
-Description=A free and open source manga reader server that runs extensions built for Tachiyomi.
-Wants=network-online.target
-After=network-online.target
-
-[Service]
-Type=simple
-User=tachidesk
-Group=tachidesk
-SyslogIdentifier=tachidesk
-
-EnvironmentFile=/etc/tachidesk/server.conf
-ExecStart=/usr/bin/java $JAVA_ARGS -Dsuwayomi.tachidesk.config.server.rootDir="${TACHIDESK_ROOT_DIR}" -jar /usr/share/java/tachidesk-server/tachidesk-server.jar
-Restart=on-failure
-
-ProtectSystem=full
-ProtectHome=true
-PrivateTmp=yes
-PrivateDevices=yes
-ProtectClock=yes
-ProtectKernelTunables=yes
-ProtectKernelModules=yes
-ProtectKernelLogs=yes
-ProtectControlGroups=yes
-RestrictSUIDSGID=yes
-RestrictRealtime=yes
-RestrictNamespaces=yes
-NoNewPrivileges=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/tachidesk-server.sysusers b/tachidesk-server.sysusers
deleted file mode 100644
index 8a666c246277..000000000000
--- a/tachidesk-server.sysusers
+++ /dev/null
@@ -1,2 +0,0 @@
-#Type    Name       ID    GECOS                                 Home directory              Shell
-u        tachidesk  -     "Tachidesk Manga Server"              /var/lib/tachidesk
diff --git a/tachidesk-server.tmpfiles b/tachidesk-server.tmpfiles
deleted file mode 100644
index d967daa87b0b..000000000000
--- a/tachidesk-server.tmpfiles
+++ /dev/null
@@ -1,2 +0,0 @@
-#Type  Path                Mode  User       Group      Age  Argument
-d      /var/lib/tachidesk  0755  tachidesk  tachidesk