Rename every instance of Tachidesk jar to Tachdidesk-Server.jar (#384)

Suwayomi · Aug 10, 2022 · 55240d9 · 55240d9
1 parent 9dc5981
commit 55240d9
Show file tree

Hide file tree

Showing 18 changed files with 21 additions and 21 deletions.
diff --git 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
@@ -1 +1 @@
-start "" jre/bin/javaw -jar Tachidesk.jar
+start "" jre/bin/javaw -jar Tachidesk-Server.jasr
diff --git 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
+./jre/Contents/Home/bin/java -jar Tachidesk-Server.jasr
diff --git 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
diff --git 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
@@ -1 +1 @@
-jre\bin\javaw "-Dsuwayomi.tachidesk.config.server.webUIInterface=electron" "-Dsuwayomi.tachidesk.config.server.electronPath=electron/electron.exe" -jar Tachidesk.jar
+jre\bin\javaw "-Dsuwayomi.tachidesk.config.server.webUIInterface=electron" "-Dsuwayomi.tachidesk.config.server.electronPath=electron/electron.exe" -jar Tachidesk-Server.jasr
diff --git 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
+./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
diff --git 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
@@ -31,7 +31,7 @@
     <!-- Component -->
     <DirectoryRef Id="INSTALLDIR">
       <Component Id="TachideskJAR" Guid="*" Win64="yes">
-          <File Id="Tachidesk.jar" Source="$(var.SourceDir)/Tachidesk.jar" KeyPath="yes" />
+          <File Id="Tachidesk-Server.jar" Source="$(var.SourceDir)/Tachidesk-Server.jar" KeyPath="yes" />
       </Component>
 
       <Component Id="TachideskBrowserBAT" Guid="*" Win64="yes">

diff --git a/scripts/resources/msi/tachidesk-server-x86.wxs b/scripts/resources/msi/tachidesk-server-x86.wxs
@@ -27,7 +27,7 @@
     <!-- Component -->
     <DirectoryRef Id="INSTALLDIR">
       <Component Id="TachideskJAR" Guid="*">
-          <File Id="Tachidesk.jar" Source="$(var.SourceDir)/Tachidesk.jar" KeyPath="yes" />
+          <File Id="Tachidesk-Server.jar" Source="$(var.SourceDir)/Tachidesk-Server.jar" KeyPath="yes" />
       </Component>
 
       <Component Id="TachideskBrowserBAT" Guid="*">

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		start "" jre/bin/javaw -jar Tachidesk.jar
		start "" jre/bin/javaw -jar Tachidesk-Server.jasr
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		jre\bin\javaw "-Dsuwayomi.tachidesk.config.server.webUIInterface=electron" "-Dsuwayomi.tachidesk.config.server.electronPath=electron/electron.exe" -jar Tachidesk.jar
		jre\bin\javaw "-Dsuwayomi.tachidesk.config.server.webUIInterface=electron" "-Dsuwayomi.tachidesk.config.server.electronPath=electron/electron.exe" -jar Tachidesk-Server.jasr