From b5984ae522b6c220c7fa59acbcf493f14dd9499c Mon Sep 17 00:00:00 2001 From: Adele Reed Date: Sat, 3 Dec 2022 10:24:25 -0800 Subject: [PATCH 1/6] Correct syntax error in dep-resolvers/arch.sh --- dependency-resolvers/arch.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/dependency-resolvers/arch.sh b/dependency-resolvers/arch.sh index 517e0fc..6efbc13 100644 --- a/dependency-resolvers/arch.sh +++ b/dependency-resolvers/arch.sh @@ -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" From 9e7f2a0273263cc20d4e1b7f53d48f93a84a4969 Mon Sep 17 00:00:00 2001 From: Adele Reed Date: Sat, 3 Dec 2022 10:25:48 -0800 Subject: [PATCH 2/6] Remove calls to now no-longer existent config/xlcore.sh --- setup-stage1.sh | 1 - setup-stage2.sh | 1 - 2 files changed, 2 deletions(-) diff --git a/setup-stage1.sh b/setup-stage1.sh index b977bc9..165bc6f 100755 --- a/setup-stage1.sh +++ b/setup-stage1.sh @@ -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 diff --git a/setup-stage2.sh b/setup-stage2.sh index 80247c1..0dbce7e 100755 --- a/setup-stage2.sh +++ b/setup-stage2.sh @@ -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 From d9fa0c0b9ad4aa67010c7e19dc1cbe53c43152bd Mon Sep 17 00:00:00 2001 From: Adele Reed Date: Sat, 3 Dec 2022 10:30:57 -0800 Subject: [PATCH 3/6] Prevent picking up the backup as a valid wine distribution --- setup-stage1.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup-stage1.sh b/setup-stage1.sh index 165bc6f..bdf54a8 100755 --- a/setup-stage1.sh +++ b/setup-stage1.sh @@ -133,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=$(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 From 5bf5215d01854997b47f82e5f45fb2370410dc25 Mon Sep 17 00:00:00 2001 From: Adele Reed Date: Sat, 3 Dec 2022 10:48:20 -0800 Subject: [PATCH 4/6] Make regex more lenient to catch FFXIV --- setup-stage2.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup-stage2.sh b/setup-stage2.sh index 0dbce7e..73b417c 100755 --- a/setup-stage2.sh +++ b/setup-stage2.sh @@ -35,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" From dc5991f6b8daac05005b729b8ebed304fcb64a20 Mon Sep 17 00:00:00 2001 From: Adele Reed Date: Sat, 3 Dec 2022 11:01:22 -0800 Subject: [PATCH 5/6] Fix wine version pickup --- setup-stage1.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup-stage1.sh b/setup-stage1.sh index bdf54a8..898554b 100755 --- a/setup-stage1.sh +++ b/setup-stage1.sh @@ -133,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 -1trd $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 From d2831a0bda03caebcbce206286b8d380a0b538f9 Mon Sep 17 00:00:00 2001 From: Adele Reed Date: Tue, 6 Dec 2022 12:00:35 -0800 Subject: [PATCH 6/6] Fix wine version printout --- setup-stage1.sh | 1 + setup-stage2.sh | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/setup-stage1.sh b/setup-stage1.sh index 898554b..906a140 100755 --- a/setup-stage1.sh +++ b/setup-stage1.sh @@ -161,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 diff --git a/setup-stage2.sh b/setup-stage2.sh index 73b417c..d2f2f4a 100755 --- a/setup-stage2.sh +++ b/setup-stage2.sh @@ -51,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