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

Commit:

---

Hash: 0f9dc4ef2b47e6dba1fc5ced4d7e5fb53f0baa1a

Message: Update launcher scripts

Diff

---

diff --git a/.SRCINFO b/.SRCINFO
index 7adf99d..5245393 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 = 3
+	pkgrel = 4
 	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-launcher-standalone.sh
-	source = tachidesk-debug-launcher-standalone.sh
-	source = tachidesk-electron-launcher-standalone.sh
+	source = tachidesk-server-browser-launcher.sh
+	source = tachidesk-server-debug-launcher.sh
+	source = tachidesk-server-electron-launcher-debian.sh
 	sha256sums = 05b9573e071dcfb9e656fa5ed34c122ea38767e38a23b4a4354737f6439eaf25
-	sha256sums = 22a6a9a8c8198985759f66b35377d87bce82d46dbf7a4a7505b55621a9c5487e
+	sha256sums = 7ec4e0722d0312384672ccd01d939cce0fe356cf16d23f3473e7502cdddbccd3
 	sha256sums = 7528715b5b8d8360a9fd7dc096b51fd52bf3da671167e224b6cb637437fc4831
 	sha256sums = 1a075de252d4d1e4a025e26d379985995893e03d2ac9182ab8a48624b7076470
 	sha256sums = 39636e9a235e129312cbea43ffdaa3739fa24737e1d6b3388b354d0219272f8b
-	sha256sums = 0cb9ccd1cda5d7dbb4954a465394ba56e4d5e9c3a8afb86a0985d0f23d7b0083
+	sha256sums = 649772bbc24b8e828bbec14ed648f58874b9dbfad1d6640ebb2f7fb6c55de46b
 
 pkgname = tachidesk-server
diff --git a/PKGBUILD b/PKGBUILD
index d303a3d..14c6c3c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,38 @@
 # Maintainer: Mahor Foruzesh <mahorforuzesh at pm dot me>
 
 pkgname=tachidesk-server
-__pkgname=tachidesk
+PkgName=Tachidesk-Server
 pkgver=0.6.1
 revnum=1072
-pkgrel=3
+pkgrel=4
 pkgdesc='A free and open source manga reader that runs extensions built for Tachiyomi'
 arch=('any')
-url='https://github.com/Suwayomi/Tachidesk-Server'
+url="https://github.com/Suwayomi/$PkgName"
 license=('MPL2')
 depends=('java-runtime>=8')
 optdepends=('electron: running in Electron')
-provides=('tachidesk-server')
-jar=Tachidesk-Server-v$pkgver-r$revnum.jar
+provides=("$pkgname")
+jar=$PkgName-v$pkgver-r$revnum.jar
 source=("$url/releases/download/v$pkgver/$jar"
         "$pkgname.desktop"
         "$pkgname.png"
-        "$__pkgname-browser-launcher-standalone.sh"
-        "$__pkgname-debug-launcher-standalone.sh"
-        "$__pkgname-electron-launcher-standalone.sh")
+        "$pkgname-browser-launcher.sh"
+        "$pkgname-debug-launcher.sh"
+        "$pkgname-electron-launcher-debian.sh")
 sha256sums=('05b9573e071dcfb9e656fa5ed34c122ea38767e38a23b4a4354737f6439eaf25'
             '7ec4e0722d0312384672ccd01d939cce0fe356cf16d23f3473e7502cdddbccd3'
             '7528715b5b8d8360a9fd7dc096b51fd52bf3da671167e224b6cb637437fc4831'
             '1a075de252d4d1e4a025e26d379985995893e03d2ac9182ab8a48624b7076470'
             '39636e9a235e129312cbea43ffdaa3739fa24737e1d6b3388b354d0219272f8b'
-            '0cb9ccd1cda5d7dbb4954a465394ba56e4d5e9c3a8afb86a0985d0f23d7b0083')
+            '649772bbc24b8e828bbec14ed648f58874b9dbfad1d6640ebb2f7fb6c55de46b')
 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-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
+    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-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-debian.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
deleted file mode 100755
index 16d6396..0000000
--- a/tachidesk-browser-launcher-standalone.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-debug-launcher-standalone.sh b/tachidesk-debug-launcher-standalone.sh
deleted file mode 100755
index dabd62a..0000000
--- a/tachidesk-debug-launcher-standalone.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-electron-launcher-standalone.sh b/tachidesk-electron-launcher-standalone.sh
deleted file mode 100755
index a4b3c1a..0000000
--- a/tachidesk-electron-launcher-standalone.sh
+++ /dev/null
@@ -1,14 +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.
-
-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-server-browser-launcher.sh b/tachidesk-server-browser-launcher.sh
new file mode 100644
index 0000000..16d6396
--- /dev/null
+++ b/tachidesk-server-browser-launcher.sh
@@ -0,0 +1,2 @@
+#!/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
new file mode 100644
index 0000000..dabd62a
--- /dev/null
+++ b/tachidesk-server-debug-launcher.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-server-electron-launcher-debian.sh b/tachidesk-server-electron-launcher-debian.sh
new file mode 100644
index 0000000..c221da9
--- /dev/null
+++ b/tachidesk-server-electron-launcher-debian.sh
@@ -0,0 +1,12 @@
+#!/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