Skip to content

Commit

Permalink
Fix Launcher paths
Browse files Browse the repository at this point in the history
  • Loading branch information
AriaMoradi committed Aug 10, 2022
1 parent bdf3a70 commit 2e89b3a
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions scripts/bundler.sh
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,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/"
Expand Down Expand Up @@ -211,7 +211,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"
Expand Down
2 changes: 1 addition & 1 deletion scripts/resources/Tachidesk Browser Launcher.bat
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.jar
2 changes: 1 addition & 1 deletion scripts/resources/Tachidesk Browser Launcher.command
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
cd "`dirname "$0"`"

./jre/Contents/Home/bin/java -jar Tachidesk.jar
./jre/Contents/Home/bin/java -jar Tachidesk-Server.jar
2 changes: 1 addition & 1 deletion scripts/resources/Tachidesk Debug Launcher.bat
Original file line number Diff line number Diff line change
@@ -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.jar

:: Prevent cmd from closing when Tachidesk crashes
pause
2 changes: 1 addition & 1 deletion scripts/resources/Tachidesk Debug Launcher.command
Original file line number Diff line number Diff line change
@@ -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.jar
2 changes: 1 addition & 1 deletion scripts/resources/Tachidesk Electron Launcher.bat
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.jar
2 changes: 1 addition & 1 deletion scripts/resources/Tachidesk Electron Launcher.command
Original file line number Diff line number Diff line change
@@ -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.jar

0 comments on commit 2e89b3a

Please sign in to comment.