Skip to content

Fix a variety of setup bugs #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Riven-Spell wants to merge 6 commits into
base: xlcore
Choose a base branch
from
Open

Fix a variety of setup bugs #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b5984ae
Correct syntax error in dep-resolvers/arch.sh
Riven-Spell Dec 3, 2022
9e7f2a0
Remove calls to now no-longer existent config/xlcore.sh
Riven-Spell Dec 3, 2022
d9fa0c0
Prevent picking up the backup as a valid wine distribution
Riven-Spell Dec 3, 2022
5bf5215
Make regex more lenient to catch FFXIV
Riven-Spell Dec 3, 2022
dc5991f
Fix wine version pickup
Riven-Spell Dec 3, 2022
d2831a0
Fix wine version printout
Riven-Spell Dec 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion dependency-resolvers/arch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ ARCH_MISC() {
echo "You must reboot after applying these settings."
exit 1
;;
*)
"wine_deps")
echo "Please refer to the lutris documentation here:"
echo "https://github.com/lutris/docs/blob/master/WineDependencies.md"
Expand Down
4 changes: 2 additions & 2 deletions setup-stage1.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
. helpers/funcs.sh
. helpers/ensure-aur-xlcore.sh

. config/xlcore.sh
# Determine where the user wants to install the tools
. config/ffxiv-tools-location.sh

Expand Down Expand Up @@ -134,7 +133,7 @@ printf -v FFXIV_ENVIRON_FINAL '%s\nexport XIVLAUNCHER_PATH=%q' "$FFXIV_ENVIRON_F
MANAGED_WINE=$(grep 'WineStartupType' $HOME/.xlcore/launcher.ini | sed 's/WineStartupType=\(.*\)/\1/')
if [[ $MANAGED_WINE == *"Managed"* ]]; then
# Find the actual wine version name inside the XLCore directory.
XLCORE_WINE_VERSION=$(ls -1tr $HOME/.xlcore/compatibilitytool/beta | tail -n1)
XLCORE_WINE_VERSION=$(basename "$(ls -1trd $HOME/.xlcore/compatibilitytool/beta/*/)" | tail -n1)
# This is hard-coded in XLCore, and is vanishingly unlikely to ever change.
PROTON_PATH="$HOME/.xlcore/compatibilitytool/beta/$XLCORE_WINE_VERSION/bin/wine"
else
Expand Down Expand Up @@ -162,6 +161,7 @@ echo "FFXIV Game Location: $FFXIV_PATH"
echo "wine Executable Location: $PROTON_PATH"
echo "wine Distribution Path: $PROTON_DIST_PATH"
echo "Wine Prefix: $WINEPREFIX"
echo "Wine version: $XLCORE_WINE_VERSION"
echo "XIVLauncher Windows Path: $XIVLAUNCHER_PATH"
echo

Expand Down
4 changes: 1 addition & 3 deletions setup-stage2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
. helpers/error.sh
. helpers/prompt.sh
. helpers/funcs.sh
. config/xlcore.sh

# Determine where the user wants to install the tools
. config/ffxiv-tools-location.sh
Expand Down Expand Up @@ -36,7 +35,7 @@ echo "Making sure that Wine isn't running anything..."
# runner (the FFXIV container's) to itself terminate all running programs?

while true; do
GET_NEWEST_PID "WINE_EXE_PID" '[A-Z]:\\.*\.exe$'; PID_SUCCESS=$?
GET_NEWEST_PID "WINE_EXE_PID" '[A-Z]:\\.*\.exe'; PID_SUCCESS=$?
[[ "$PID_SUCCESS" -ne 0 ]] && break
warn "Detected Wine process ($WINE_EXE_PID). Forcing it to exit..."
kill -9 "$WINE_EXE_PID"
Expand All @@ -52,7 +51,6 @@ warn 'Note that the next step is destructive, meaning that if something goes wro
echo 'Please make backups of both!'
echo "Wine prefix: $WINEPREFIX"
echo "wine distribution: $PROTON_DIST_PATH"
echo "Wine version: $XLCORE_WINE_VERSION"

PROMPT_BACKUP

Expand Down