diff --git a/scripts/bundler.sh b/scripts/bundler.sh index 08961840c..d2bf68de2 100755 --- a/scripts/bundler.sh +++ b/scripts/bundler.sh @@ -160,7 +160,7 @@ copy_linux_package_assets_to() { } make_linux_bundle() { - cp "$JAR" "$RELEASE_NAME/tachidesk-server.jar" + cp "$JAR" "$RELEASE_NAME/Tachidesk-Server.jar" cp "scripts/resources/tachidesk-server-browser-launcher.sh" "$RELEASE_NAME/" cp "scripts/resources/tachidesk-server-debug-launcher.sh" "$RELEASE_NAME/" cp "scripts/resources/tachidesk-server-electron-launcher.sh" "$RELEASE_NAME/" @@ -169,7 +169,7 @@ make_linux_bundle() { } make_macos_bundle() { - cp "$JAR" "$RELEASE_NAME/Tachidesk.jar" + cp "$JAR" "$RELEASE_NAME/Tachidesk-Server.jar" cp "scripts/resources/Tachidesk Browser Launcher.command" "$RELEASE_NAME/" cp "scripts/resources/Tachidesk Debug Launcher.command" "$RELEASE_NAME/" cp "scripts/resources/Tachidesk Electron Launcher.command" "$RELEASE_NAME/" @@ -184,7 +184,7 @@ make_deb_package() { temp_dir="$(mktemp -d)" trap "rm -rf $temp_dir" RETURN - cp "$JAR" "$RELEASE_NAME/tachidesk-server.jar" + cp "$JAR" "$RELEASE_NAME/Tachidesk-Server.jar" tar -I "gzip" -cvf "$RELEASE_NAME.tar.gz" "$RELEASE_NAME/" #behind $RELEASE_VERSION is underscore "_" local upstream_source="tachidesk-server_$RELEASE_VERSION.orig.tar.gz" @@ -236,7 +236,7 @@ make_windows_bundle() { #WINEARCH=win32 wine "$rcedit" "$RELEASE_NAME/electron/electron.exe" \ # --set-icon "$icon" - cp "$JAR" "$RELEASE_NAME/Tachidesk.jar" + cp "$JAR" "$RELEASE_NAME/Tachidesk-Server.jar" cp "scripts/resources/Tachidesk Browser Launcher.bat" "$RELEASE_NAME" cp "scripts/resources/Tachidesk Debug Launcher.bat" "$RELEASE_NAME" cp "scripts/resources/Tachidesk Electron Launcher.bat" "$RELEASE_NAME" diff --git a/scripts/resources/Tachidesk Browser Launcher.bat b/scripts/resources/Tachidesk Browser Launcher.bat index 45da249db..93585def9 100644 --- a/scripts/resources/Tachidesk Browser Launcher.bat +++ b/scripts/resources/Tachidesk Browser Launcher.bat @@ -1 +1 @@ -start "" jre/bin/javaw -jar Tachidesk.jar \ No newline at end of file +start "" jre/bin/javaw -jar Tachidesk-Server.jasr \ No newline at end of file diff --git a/scripts/resources/Tachidesk Browser Launcher.command b/scripts/resources/Tachidesk Browser Launcher.command index c4a272b1a..783dfa6a5 100755 --- a/scripts/resources/Tachidesk Browser Launcher.command +++ b/scripts/resources/Tachidesk Browser Launcher.command @@ -1,3 +1,3 @@ cd "`dirname "$0"`" -./jre/Contents/Home/bin/java -jar Tachidesk.jar \ No newline at end of file +./jre/Contents/Home/bin/java -jar Tachidesk-Server.jasr \ No newline at end of file diff --git a/scripts/resources/Tachidesk Debug Launcher.bat b/scripts/resources/Tachidesk Debug Launcher.bat index 3976c9b22..e806e87ba 100644 --- a/scripts/resources/Tachidesk Debug Launcher.bat +++ b/scripts/resources/Tachidesk Debug Launcher.bat @@ -1,7 +1,7 @@ :: cleaner output @echo off -jre\bin\java -Dsuwayomi.tachidesk.config.server.debugLogsEnabled=true -jar Tachidesk.jar +jre\bin\java -Dsuwayomi.tachidesk.config.server.debugLogsEnabled=true -jar Tachidesk-Server.jasr :: Prevent cmd from closing when Tachidesk crashes pause \ No newline at end of file diff --git a/scripts/resources/Tachidesk Debug Launcher.command b/scripts/resources/Tachidesk Debug Launcher.command index 79514fb58..c0d8d4cd4 100755 --- a/scripts/resources/Tachidesk Debug Launcher.command +++ b/scripts/resources/Tachidesk Debug Launcher.command @@ -1,3 +1,3 @@ cd "`dirname "$0"`" -./jre/Contents/Home/bin/java -Dsuwayomi.tachidesk.config.server.debugLogsEnabled=true -jar Tachidesk.jar +./jre/Contents/Home/bin/java -Dsuwayomi.tachidesk.config.server.debugLogsEnabled=true -jar Tachidesk-Server.jasr diff --git a/scripts/resources/Tachidesk Electron Launcher.bat b/scripts/resources/Tachidesk Electron Launcher.bat index 757f40aac..23ffae5b8 100644 --- a/scripts/resources/Tachidesk Electron Launcher.bat +++ b/scripts/resources/Tachidesk Electron Launcher.bat @@ -1 +1 @@ -jre\bin\javaw "-Dsuwayomi.tachidesk.config.server.webUIInterface=electron" "-Dsuwayomi.tachidesk.config.server.electronPath=electron/electron.exe" -jar Tachidesk.jar \ No newline at end of file +jre\bin\javaw "-Dsuwayomi.tachidesk.config.server.webUIInterface=electron" "-Dsuwayomi.tachidesk.config.server.electronPath=electron/electron.exe" -jar Tachidesk-Server.jasr \ No newline at end of file diff --git a/scripts/resources/Tachidesk Electron Launcher.command b/scripts/resources/Tachidesk Electron Launcher.command index a611702c0..41921bf39 100755 --- a/scripts/resources/Tachidesk Electron Launcher.command +++ b/scripts/resources/Tachidesk Electron Launcher.command @@ -1,3 +1,3 @@ cd "`dirname "$0"`" -./jre/Contents/Home/bin/java "-Dsuwayomi.tachidesk.config.server.webUIInterface=electron" "-Dsuwayomi.tachidesk.config.server.electronPath=electron/Electron.app/Contents/MacOS/Electron" -jar Tachidesk.jar \ No newline at end of file +./jre/Contents/Home/bin/java "-Dsuwayomi.tachidesk.config.server.webUIInterface=electron" "-Dsuwayomi.tachidesk.config.server.electronPath=electron/Electron.app/Contents/MacOS/Electron" -jar Tachidesk-Server.jasr \ No newline at end of file diff --git a/scripts/resources/deb/install b/scripts/resources/deb/install index dd09e1263..9d1355e15 100755 --- a/scripts/resources/deb/install +++ b/scripts/resources/deb/install @@ -1,6 +1,6 @@ #!/usr/bin/dh-exec -tachidesk-server.jar usr/share/java/tachidesk-server/ +Tachidesk-Server.jar usr/share/java/tachidesk-server/ debian/tachidesk-server.png usr/share/pixmaps/ debian/tachidesk-server.desktop usr/share/applications/ debian/tachidesk-server.service usr/lib/systemd/system/ diff --git a/scripts/resources/msi/tachidesk-server-x64.wxs b/scripts/resources/msi/tachidesk-server-x64.wxs index 36f160801..509469253 100755 --- a/scripts/resources/msi/tachidesk-server-x64.wxs +++ b/scripts/resources/msi/tachidesk-server-x64.wxs @@ -31,7 +31,7 @@ - + diff --git a/scripts/resources/msi/tachidesk-server-x86.wxs b/scripts/resources/msi/tachidesk-server-x86.wxs index 0d736fe86..d0493053c 100755 --- a/scripts/resources/msi/tachidesk-server-x86.wxs +++ b/scripts/resources/msi/tachidesk-server-x86.wxs @@ -27,7 +27,7 @@ - + diff --git a/scripts/resources/pkg/systemd/tachidesk-server.service b/scripts/resources/pkg/systemd/tachidesk-server.service index a72f4c497..ffacabd23 100644 --- a/scripts/resources/pkg/systemd/tachidesk-server.service +++ b/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/Tachidesk-Server.jar Restart=on-failure ProtectSystem=full diff --git a/scripts/resources/pkg/tachidesk-server-browser-launcher.sh b/scripts/resources/pkg/tachidesk-server-browser-launcher.sh index 066edce42..6dac7fe45 100644 --- a/scripts/resources/pkg/tachidesk-server-browser-launcher.sh +++ b/scripts/resources/pkg/tachidesk-server-browser-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-Server.jar diff --git a/scripts/resources/pkg/tachidesk-server-debug-launcher.sh b/scripts/resources/pkg/tachidesk-server-debug-launcher.sh index 94c23eb93..bb90590e3 100644 --- a/scripts/resources/pkg/tachidesk-server-debug-launcher.sh +++ b/scripts/resources/pkg/tachidesk-server-debug-launcher.sh @@ -2,4 +2,4 @@ exec /usr/bin/java \ -Dsuwayomi.tachidesk.config.server.debugLogsEnabled=true \ - -jar /usr/share/java/tachidesk-server/tachidesk-server.jar + -jar /usr/share/java/tachidesk-server/Tachidesk-Server.jar diff --git a/scripts/resources/pkg/tachidesk-server-electron-launcher.sh b/scripts/resources/pkg/tachidesk-server-electron-launcher.sh index f2c674524..14bcf9320 100644 --- a/scripts/resources/pkg/tachidesk-server-electron-launcher.sh +++ b/scripts/resources/pkg/tachidesk-server-electron-launcher.sh @@ -9,4 +9,4 @@ 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 + -jar /usr/share/java/tachidesk-server/Tachidesk-Server.jar diff --git a/scripts/resources/pkg/tachidesk-server.desktop b/scripts/resources/pkg/tachidesk-server.desktop index deb7e66e6..312b5da17 100644 --- a/scripts/resources/pkg/tachidesk-server.desktop +++ b/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/Tachidesk-Server.jar "\\$@" Icon=tachidesk-server Terminal=false Categories=Network; diff --git a/scripts/resources/tachidesk-server-browser-launcher.sh b/scripts/resources/tachidesk-server-browser-launcher.sh index d2f1652d0..0e3d5067f 100644 --- a/scripts/resources/tachidesk-server-browser-launcher.sh +++ b/scripts/resources/tachidesk-server-browser-launcher.sh @@ -1,3 +1,3 @@ #!/bin/sh -exec ./jre/bin/java -jar ./tachidesk-server.jar +exec ./jre/bin/java -jar ./Tachidesk-Server.jar diff --git a/scripts/resources/tachidesk-server-debug-launcher.sh b/scripts/resources/tachidesk-server-debug-launcher.sh index f736e549a..86ffc3109 100644 --- a/scripts/resources/tachidesk-server-debug-launcher.sh +++ b/scripts/resources/tachidesk-server-debug-launcher.sh @@ -2,4 +2,4 @@ exec ./jre/bin/java \ -Dsuwayomi.tachidesk.config.server.debugLogsEnabled=true \ - -jar ./tachidesk-server.jar + -jar ./Tachidesk-Server.jar diff --git a/scripts/resources/tachidesk-server-electron-launcher.sh b/scripts/resources/tachidesk-server-electron-launcher.sh index 535bcecc5..e95c6460c 100644 --- a/scripts/resources/tachidesk-server-electron-launcher.sh +++ b/scripts/resources/tachidesk-server-electron-launcher.sh @@ -3,4 +3,4 @@ exec ./jre/bin/java \ -Dsuwayomi.tachidesk.config.server.webUIInterface=electron \ -Dsuwayomi.tachidesk.config.server.electronPath=./electron/electron \ - -jar ./tachidesk-server.jar + -jar ./Tachidesk-Server.jar