add proper launcher scripts

6 files changed, 33 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0d6059f893ba..b64f1d4fe9dd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
 pkgbase = tachidesk
 	pkgdesc = A free and open source manga reader that runs extensions built for Tachiyomi
 	pkgver = 0.5.4_r995
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/Suwayomi/Tachidesk-Server
 	arch = any
 	license = MPL2
 	depends = java-runtime>=8
+	optdepends = electron: running in Electron
 	provides = tachidesk
 	provides = tachidesk-server
 	conflicts = tachidesk-preview
@@ -13,10 +14,14 @@ pkgbase = tachidesk
 	source = https://github.com/Suwayomi/Tachidesk-Server/releases/download/v0.5.4/Tachidesk-Server-v0.5.4-r995.jar
 	source = tachidesk.desktop
 	source = tachidesk.png
-	source = tachidesk.sh
+	source = tachidesk-browser.sh
+	source = tachidesk-debug.sh
+	source = tachidesk-electron.sh
 	sha256sums = e0f87bd1c57dba58c88d623ff9f8d287ce4b5d1ca390025dd7d9f3a9ae979b9d
 	sha256sums = 22a6a9a8c8198985759f66b35377d87bce82d46dbf7a4a7505b55621a9c5487e
 	sha256sums = 7528715b5b8d8360a9fd7dc096b51fd52bf3da671167e224b6cb637437fc4831
-	sha256sums = 3ac5c813b88f2dd4f38fac5dcd344f1f54dd9929fbb8faba758a972015d12c19
+	sha256sums = ab6896577aabad86dc1ed38612d926820e1c8c51074d46afda0c280e90b4f1a9
+	sha256sums = fdf5ed21e7b05a59521005ea618a40c46750a46a6cb1aa7cbd8c09bc9e595b94
+	sha256sums = 56f12c13218ad58e1c9d26338d5d19b6ced92d789b043837be5d2420657ca417
 
 pkgname = tachidesk
diff --git a/PKGBUILD b/PKGBUILD
index c0cd9ce5870b..df2fe299937f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,13 @@
 
 pkgname=tachidesk
 pkgver=0.5.4_r995
-pkgrel=1
+pkgrel=2
 pkgdesc="A free and open source manga reader that runs extensions built for Tachiyomi"
 arch=("any")
 url="https://github.com/Suwayomi/Tachidesk-Server"
 license=("MPL2")
 depends=("java-runtime>=8")
+optdepends=("electron: running in Electron")
 provides=("tachidesk" "tachidesk-server")
 conflicts=("tachidesk-preview")
 _semver="v${pkgver%_*}"
@@ -18,11 +19,15 @@ _jar=Tachidesk-Server-${_semver}-${_commit}.jar
 source=("${url}/releases/download/${_semver}/${_jar}"
         "${pkgname}.desktop"
         "${pkgname}.png"
-        "${pkgname}.sh")
+        "${pkgname}-browser.sh"
+        "${pkgname}-debug.sh"
+        "${pkgname}-electron.sh")
 sha256sums=('e0f87bd1c57dba58c88d623ff9f8d287ce4b5d1ca390025dd7d9f3a9ae979b9d'
             '22a6a9a8c8198985759f66b35377d87bce82d46dbf7a4a7505b55621a9c5487e'
             '7528715b5b8d8360a9fd7dc096b51fd52bf3da671167e224b6cb637437fc4831'
-            '3ac5c813b88f2dd4f38fac5dcd344f1f54dd9929fbb8faba758a972015d12c19')
+            'ab6896577aabad86dc1ed38612d926820e1c8c51074d46afda0c280e90b4f1a9'
+            'fdf5ed21e7b05a59521005ea618a40c46750a46a6cb1aa7cbd8c09bc9e595b94'
+            '56f12c13218ad58e1c9d26338d5d19b6ced92d789b043837be5d2420657ca417')
 
 noextract=("${_jar}")
 
@@ -30,5 +35,7 @@ package() {
     install -Dm644 "${srcdir}/${_jar}"                "${pkgdir}/usr/share/java/${pkgname}/${pkgname}.jar"
     install -Dm644 "${srcdir}/${pkgname}.desktop"  -t "${pkgdir}/usr/share/applications/"
     install -Dm644 "${srcdir}/${pkgname}.png"      -t "${pkgdir}/usr/share/pixmaps/"
-    install -Dm755 "${srcdir}/${pkgname}.sh"          "${pkgdir}/usr/bin/${pkgname}"
+    install -Dm755 "${srcdir}/${pkgname}-browser.sh"  "${pkgdir}/usr/bin/${pkgname}-browser"
+    install -Dm755 "${srcdir}/${pkgname}-debug.sh"    "${pkgdir}/usr/bin/${pkgname}-debug"
+    install -Dm755 "${srcdir}/${pkgname}-electron.sh" "${pkgdir}/usr/bin/${pkgname}-electron"
 }
diff --git a/tachidesk-browser.sh b/tachidesk-browser.sh
new file mode 100644
index 000000000000..aa0b845943ff
--- /dev/null
+++ b/tachidesk-browser.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/java -jar /usr/share/java/tachidesk/tachidesk.jar
diff --git a/tachidesk-debug.sh b/tachidesk-debug.sh
new file mode 100644
index 000000000000..46f67ab62833
--- /dev/null
+++ b/tachidesk-debug.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/java -Dsuwayomi.tachidesk.config.server.debugLogsEnabled=true -jar /usr/share/java/tachidesk/tachidesk.jar
diff --git a/tachidesk-electron.sh b/tachidesk-electron.sh
new file mode 100644
index 000000000000..6dff820f1e52
--- /dev/null
+++ b/tachidesk-electron.sh
@@ -0,0 +1,10 @@
+#!/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/tachidesk.jar
diff --git a/tachidesk.sh b/tachidesk.sh
deleted file mode 100644
index 1dcee4252e9c..000000000000
--- a/tachidesk.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/java -jar /usr/share/java/tachidesk/tachidesk.jar "$@"