Use Tachidesk-Launcher (#618)

* Use the Launcher

* Test launcher

* a

* Revert "a"

This reverts commit eb8667e4397c20dae7a7dfdf26058f5aff76fff8.

* Move launcher

* Test launcher 2

* Update dex2jar

* Fixes

* Use regular java with deb install

* Improve linux installs

* Revert "Test launcher 2"

This reverts commit 265825808fd82616223e4a919718ea87a7eeff43.

* Revert "Test launcher"

This reverts commit 7ff83c7ab954bcab6c0b039701041b639a489382.

scripts/resources/pkg/systemd/tachidesk-server.service

@@ -10,7 +10,7 @@ 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
+ExecStart=/usr/bin/java $JAVA_ARGS -Dsuwayomi.tachidesk.config.server.rootDir="${TACHIDESK_ROOT_DIR}" -jar /usr/share/java/tachidesk-server/bin/Tachidesk-Server.jar
 Restart=on-failure
 
 ProtectSystem=full

scripts/resources/pkg/tachidesk-launcher.desktop

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Tachidesk-Launcher
+Comment=Manga Reader
+Exec=/usr/bin/java -jar /usr/share/java/tachidesk-server/Tachidesk-Launcher.jar "\\$@"
+Icon=tachidesk-server
+Terminal=false
+Categories=Network;

scripts/resources/pkg/tachidesk-launcher.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec /usr/bin/java -jar /usr/share/java/tachidesk-server/Tachidesk-Server.jar
+exec /usr/bin/java -jar /usr/share/java/tachidesk-server/Tachidesk-Launcher.jar

scripts/resources/pkg/tachidesk-server-debug-launcher.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-exec /usr/bin/java \
-    -Dsuwayomi.tachidesk.config.server.debugLogsEnabled=true \
-    -jar /usr/share/java/tachidesk-server/Tachidesk-Server.jar

scripts/resources/pkg/tachidesk-server-electron-launcher.sh

@@ -1,12 +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."
-    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

scripts/resources/pkg/tachidesk-server.desktop

@@ -2,7 +2,7 @@
 Type=Application
 Name=Tachidesk-Server
 Comment=Manga Reader
-Exec=/usr/bin/java -jar /usr/share/java/tachidesk-server/Tachidesk-Server.jar "\\$@"
+Exec=/usr/bin/java -jar /usr/share/java/tachidesk-server/bin/Tachidesk-Server.jar "\\$@"
 Icon=tachidesk-server
 Terminal=false
 Categories=Network;

scripts/resources/pkg/tachidesk-server.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/bin/java -jar /usr/share/java/tachidesk-server/bin/Tachidesk-Server.jar