Skip to content
This repository has been archived by the owner on Apr 4, 2024. It is now read-only.

Commit

Permalink
fix(macos): change hardcoded paths
Browse files Browse the repository at this point in the history
  • Loading branch information
@MindTooth
MindTooth committed Dec 5, 2023
1 parent 1375ba0 commit cf659d8
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
30 changes: 15 additions & 15 deletions subprocess/ftbapp.install4j
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,30 +41,30 @@
<mountPoint id="74" root="59" />
<mountPoint id="224" root="61" />
<mountPoint id="668" root="61" location="bin" />
<mountPoint id="669" root="61" location="bin/ftbapp.app" />
<mountPoint id="670" root="61" location="bin/ftbapp.app/Contents" />
<mountPoint id="671" root="61" location="bin/ftbapp.app/Contents/Frameworks" />
<mountPoint id="672" root="61" location="bin/ftbapp.app/Contents/Frameworks/Electron Framework.framework" />
<mountPoint id="673" root="61" location="bin/ftbapp.app/Contents/Frameworks/Squirrel.framework" />
<mountPoint id="674" root="61" location="bin/ftbapp.app/Contents/Frameworks/Mantle.framework" />
<mountPoint id="675" root="61" location="bin/ftbapp.app/Contents/Frameworks/ReactiveObjC.framework" />
<mountPoint id="669" root="61" location="bin/FTB App.app" />
<mountPoint id="670" root="61" location="bin/FTB App.app/Contents" />
<mountPoint id="671" root="61" location="bin/FTB App.app/Contents/Frameworks" />
<mountPoint id="672" root="61" location="bin/FTB App.app/Contents/Frameworks/Electron Framework.framework" />
<mountPoint id="673" root="61" location="bin/FTB App.app/Contents/Frameworks/Squirrel.framework" />
<mountPoint id="674" root="61" location="bin/FTB App.app/Contents/Frameworks/Mantle.framework" />
<mountPoint id="675" root="61" location="bin/FTB App.app/Contents/Frameworks/ReactiveObjC.framework" />
<mountPoint id="225" root="64" />
</mountPoints>
<entries>
<fileEntry mountPoint="73" file="./build/libs/launcher-${compiler:sys.version}-all.jar" />
<dirEntry mountPoint="74" file="../release/win-unpacked" entryMode="subdir" subDirectory="bin" />
<dirEntry mountPoint="224" file="../release/mac" entryMode="subdir" subDirectory="bin">
<exclude>
<entry location="ftbapp.app/Contents/Frameworks/Electron Framework.framework/Versions" />
<entry location="ftbapp.app/Contents/Frameworks/Squirrel.framework/Versions" />
<entry location="ftbapp.app/Contents/Frameworks/Mantle.framework/Versions" />
<entry location="ftbapp.app/Contents/Frameworks/ReactiveObjC.framework/Versions" />
<entry location="FTB App.app/Contents/Frameworks/Electron Framework.framework/Versions" />
<entry location="FTB App.app/Contents/Frameworks/Squirrel.framework/Versions" />
<entry location="FTB App.app/Contents/Frameworks/Mantle.framework/Versions" />
<entry location="FTB App.app/Contents/Frameworks/ReactiveObjC.framework/Versions" />
</exclude>
</dirEntry>
<dirEntry mountPoint="672" file="../release/mac/ftbapp.app/Contents/Frameworks/Electron Framework.framework/Versions/A" subDirectory="mac" />
<dirEntry mountPoint="673" file="../release/mac/ftbapp.app/Contents/Frameworks/Squirrel.framework/Versions/A" subDirectory="mac" />
<dirEntry mountPoint="674" file="../release/mac/ftbapp.app/Contents/Frameworks/Mantle.framework/Versions/A" subDirectory="mac" />
<dirEntry mountPoint="675" file="../release/mac/ftbapp.app/Contents/Frameworks/ReactiveObjC.framework/Versions/A" subDirectory="mac" />
<dirEntry mountPoint="672" file="../release/mac/FTB App.app/Contents/Frameworks/Electron Framework.framework/Versions/A" subDirectory="mac" />
<dirEntry mountPoint="673" file="../release/mac/FTB App.app/Contents/Frameworks/Squirrel.framework/Versions/A" subDirectory="mac" />
<dirEntry mountPoint="674" file="../release/mac/FTB App.app/Contents/Frameworks/Mantle.framework/Versions/A" subDirectory="mac" />
<dirEntry mountPoint="675" file="../release/mac/FTB App.app/Contents/Frameworks/ReactiveObjC.framework/Versions/A" subDirectory="mac" />
<dirEntry mountPoint="225" file="../release/linux-unpacked" entryMode="subdir" subDirectory="bin" />
</entries>
<components>
Expand Down
4 changes: 2 additions & 2 deletions subprocess/src/main/java/net/creeperhost/creeperlauncher/CreeperLauncher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -450,8 +450,8 @@ private static void startElectron() {

switch (OS.CURRENT) {
case MAC:
electron = Constants.BIN_LOCATION_OURS.resolve("ftbapp.app");
args.add(0, electron.resolve("Contents/MacOS/ftbapp").toAbsolutePath().toString());
electron = Constants.BIN_LOCATION_OURS.resolve("FTB App.app");
args.add(0, electron.resolve("Contents/MacOS/FTB App").toAbsolutePath().toString());
break;
case LINUX:
electron = Constants.BIN_LOCATION_OURS.resolve("ftb-app");
Expand Down

0 comments on commit cf659d8

Please sign in to comment.