Click here to go back to the commit logs for tachidesk-server.

Commit:

---

Hash: 494a97f936bc5f98b73f2e243696ef13ffa2db21

Message: Fix old launcher scripts

Diff

---

diff --git a/.SRCINFO b/.SRCINFO
index f7d4f68..7218752 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = tachidesk-server
 	pkgdesc = A free and open source manga reader that runs extensions built for Tachiyomi
 	pkgver = 0.6.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/Suwayomi/Tachidesk-Server
 	arch = any
 	license = MPL2
@@ -12,14 +12,14 @@ pkgbase = tachidesk-server
 	source = https://github.com/Suwayomi/Tachidesk-Server/releases/download/v0.6.1/Tachidesk-Server-v0.6.1-r1072.jar
 	source = tachidesk-server.desktop
 	source = tachidesk-server.png
-	source = tachidesk-browser.sh
-	source = tachidesk-debug.sh
-	source = tachidesk-electron.sh
+	source = tachidesk-browser-launcher-standalone.sh
+	source = tachidesk-debug-launcher-standalone.sh
+	source = tachidesk-electron-launcher-standalone.sh
 	sha256sums = 05b9573e071dcfb9e656fa5ed34c122ea38767e38a23b4a4354737f6439eaf25
 	sha256sums = 22a6a9a8c8198985759f66b35377d87bce82d46dbf7a4a7505b55621a9c5487e
 	sha256sums = 7528715b5b8d8360a9fd7dc096b51fd52bf3da671167e224b6cb637437fc4831
-	sha256sums = ab6896577aabad86dc1ed38612d926820e1c8c51074d46afda0c280e90b4f1a9
-	sha256sums = fdf5ed21e7b05a59521005ea618a40c46750a46a6cb1aa7cbd8c09bc9e595b94
-	sha256sums = 56f12c13218ad58e1c9d26338d5d19b6ced92d789b043837be5d2420657ca417
+	sha256sums = 1a075de252d4d1e4a025e26d379985995893e03d2ac9182ab8a48624b7076470
+	sha256sums = 39636e9a235e129312cbea43ffdaa3739fa24737e1d6b3388b354d0219272f8b
+	sha256sums = 0cb9ccd1cda5d7dbb4954a465394ba56e4d5e9c3a8afb86a0985d0f23d7b0083
 
 pkgname = tachidesk-server
diff --git a/PKGBUILD b/PKGBUILD
index 5602175..f6a64ca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=tachidesk-server
 __pkgname=tachidesk
 pkgver=0.6.1
 revnum=1072
-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'
@@ -16,23 +16,23 @@ jar=Tachidesk-Server-v$pkgver-r$revnum.jar
 source=("$url/releases/download/v$pkgver/$jar"
         "$pkgname.desktop"
         "$pkgname.png"
-        "$__pkgname-browser.sh"
-        "$__pkgname-debug.sh"
-        "$__pkgname-electron.sh")
+        "$__pkgname-browser-launcher-standalone.sh"
+        "$__pkgname-debug-launcher-standalone.sh"
+        "$__pkgname-electron-launcher-standalone.sh")
 sha256sums=('05b9573e071dcfb9e656fa5ed34c122ea38767e38a23b4a4354737f6439eaf25'
             '22a6a9a8c8198985759f66b35377d87bce82d46dbf7a4a7505b55621a9c5487e'
             '7528715b5b8d8360a9fd7dc096b51fd52bf3da671167e224b6cb637437fc4831'
-            'ab6896577aabad86dc1ed38612d926820e1c8c51074d46afda0c280e90b4f1a9'
-            'fdf5ed21e7b05a59521005ea618a40c46750a46a6cb1aa7cbd8c09bc9e595b94'
-            '56f12c13218ad58e1c9d26338d5d19b6ced92d789b043837be5d2420657ca417')
+            '1a075de252d4d1e4a025e26d379985995893e03d2ac9182ab8a48624b7076470'
+            '39636e9a235e129312cbea43ffdaa3739fa24737e1d6b3388b354d0219272f8b'
+            '0cb9ccd1cda5d7dbb4954a465394ba56e4d5e9c3a8afb86a0985d0f23d7b0083')
 noextract=("$jar")
 
 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-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"
+    install -Dm755 "$srcdir/$__pkgname-browser-launcher-standalone.sh"  "$pkgdir/usr/bin/$__pkgname-browser"
+    install -Dm755 "$srcdir/$__pkgname-debug-launcher-standalone.sh"    "$pkgdir/usr/bin/$__pkgname-debug"
+    install -Dm755 "$srcdir/$__pkgname-electron-launcher-standalone.sh" "$pkgdir/usr/bin/$__pkgname-electron"
     ln -s  "$pkgdir/usr/bin/$__pkgname-browser"     "$pkgdir/usr/bin/$__pkgname" # keep backwards compatibility
 }
diff --git a/tachidesk-browser-launcher-standalone.sh b/tachidesk-browser-launcher-standalone.sh
new file mode 100755
index 0000000..16d6396
--- /dev/null
+++ b/tachidesk-browser-launcher-standalone.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/java -jar /usr/share/java/tachidesk-server/tachidesk-server.jar
diff --git a/tachidesk-browser.sh b/tachidesk-browser.sh
deleted file mode 100644
index aa0b845..0000000
--- a/tachidesk-browser.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/java -jar /usr/share/java/tachidesk/tachidesk.jar
diff --git a/tachidesk-debug-launcher-standalone.sh b/tachidesk-debug-launcher-standalone.sh
new file mode 100755
index 0000000..dabd62a
--- /dev/null
+++ b/tachidesk-debug-launcher-standalone.sh
@@ -0,0 +1,2 @@
+#!/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-debug.sh b/tachidesk-debug.sh
deleted file mode 100644
index 46f67ab..0000000
--- a/tachidesk-debug.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/java -Dsuwayomi.tachidesk.config.server.debugLogsEnabled=true -jar /usr/share/java/tachidesk/tachidesk.jar
diff --git a/tachidesk-electron-launcher-standalone.sh b/tachidesk-electron-launcher-standalone.sh
new file mode 100755
index 0000000..a4b3c1a
--- /dev/null
+++ b/tachidesk-electron-launcher-standalone.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+if [ ! -f /usr/bin/electron ]; then
+    echo "Electron executable was not found!
+In order to run this launcher, you need Electron installed.
+
+You can install it with these commands:
+sudo apt install npm
+sudo npm install electron -g
+"
+    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-electron.sh b/tachidesk-electron.sh
deleted file mode 100644
index 6dff820..0000000
--- a/tachidesk-electron.sh
+++ /dev/null
@@ -1,10 +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/tachidesk.jar