From aa8bb01ca8139139264d814d6ed8868d26762c9b Mon Sep 17 00:00:00 2001 From: "harry.cpp" Date: Sat, 15 Mar 2025 12:31:43 +0100 Subject: [PATCH 1/3] Update wine setup scripts to create a symlink for wine64 --- .../downloads/winesetup/net6_mgfxc_wine_setup.sh | 13 +++++++++++-- .../downloads/winesetup/net8_mgfxc_wine_setup.sh | 13 +++++++++++-- .../downloads/winesetup/net9_mgfxc_wine_setup.sh | 4 ++-- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/website/content/public/downloads/winesetup/net6_mgfxc_wine_setup.sh b/website/content/public/downloads/winesetup/net6_mgfxc_wine_setup.sh index 082411aa..9793e58d 100755 --- a/website/content/public/downloads/winesetup/net6_mgfxc_wine_setup.sh +++ b/website/content/public/downloads/winesetup/net6_mgfxc_wine_setup.sh @@ -53,8 +53,17 @@ curl $FIREFOX_URL --output "$SCRIPT_DIR/firefox.exe" cp -f "$SCRIPT_DIR/firefox_data/core/d3dcompiler_47.dll" "$WINEPREFIX/drive_c/windows/system32/d3dcompiler_47.dll" # append MGFXC_WINE_PATH env variable -echo -e "\nexport MGFXC_WINE_PATH=$HOME/.winemonogame" >> ~/.profile -echo -e "\nexport MGFXC_WINE_PATH=$HOME/.winemonogame" >> ~/.zprofile +echo -e "\nexport MGFXC_WINE_PATH=\"$HOME/.winemonogame\"" >> ~/.profile +echo -e "\nexport MGFXC_WINE_PATH=\"$HOME/.winemonogame\"" >> ~/.zprofile + +if ! type "wine64" > /dev/null 2>&1 +then + echo -e "\nexport PATH=\"\$PATH:$HOME/.winemonogame\"" >> ~/.profile + echo -e "\nexport PATH=\"\$PATH:$HOME/.winemonogame\"" >> ~/.zprofile + + WINEPATH=$(which $WINEEXECUTABLE) + ln -s "$WINEPATH" "$HOME/.winemonogame/wine64" +fi # cleanup rm -rf "$SCRIPT_DIR" diff --git a/website/content/public/downloads/winesetup/net8_mgfxc_wine_setup.sh b/website/content/public/downloads/winesetup/net8_mgfxc_wine_setup.sh index 4f8ccc6c..76d8d068 100755 --- a/website/content/public/downloads/winesetup/net8_mgfxc_wine_setup.sh +++ b/website/content/public/downloads/winesetup/net8_mgfxc_wine_setup.sh @@ -61,8 +61,17 @@ curl $FIREFOX_URL --output "$SCRIPT_DIR/firefox.exe" cp -f "$SCRIPT_DIR/firefox_data/core/d3dcompiler_47.dll" "$WINEPREFIX/drive_c/windows/system32/d3dcompiler_47.dll" # append MGFXC_WINE_PATH env variable -echo -e "\nexport MGFXC_WINE_PATH=$HOME/.winemonogame" >> ~/.profile -echo -e "\nexport MGFXC_WINE_PATH=$HOME/.winemonogame" >> ~/.zprofile +echo -e "\nexport MGFXC_WINE_PATH=\"$HOME/.winemonogame\"" >> ~/.profile +echo -e "\nexport MGFXC_WINE_PATH=\"$HOME/.winemonogame\"" >> ~/.zprofile + +if ! type "wine64" > /dev/null 2>&1 +then + echo -e "\nexport PATH=\"\$PATH:$HOME/.winemonogame\"" >> ~/.profile + echo -e "\nexport PATH=\"\$PATH:$HOME/.winemonogame\"" >> ~/.zprofile + + WINEPATH=$(which $WINEEXECUTABLE) + ln -s "$WINEPATH" "$HOME/.winemonogame/wine64" +fi # cleanup rm -rf "$SCRIPT_DIR" diff --git a/website/content/public/downloads/winesetup/net9_mgfxc_wine_setup.sh b/website/content/public/downloads/winesetup/net9_mgfxc_wine_setup.sh index fa1d912d..a75a89f2 100755 --- a/website/content/public/downloads/winesetup/net9_mgfxc_wine_setup.sh +++ b/website/content/public/downloads/winesetup/net9_mgfxc_wine_setup.sh @@ -61,8 +61,8 @@ curl $FIREFOX_URL --output "$SCRIPT_DIR/firefox.exe" cp -f "$SCRIPT_DIR/firefox_data/core/d3dcompiler_47.dll" "$WINEPREFIX/drive_c/windows/system32/d3dcompiler_47.dll" # append MGFXC_WINE_PATH env variable -echo -e "\nexport MGFXC_WINE_PATH=$HOME/.winemonogame" >> ~/.profile -echo -e "\nexport MGFXC_WINE_PATH=$HOME/.winemonogame" >> ~/.zprofile +echo -e "\nexport MGFXC_WINE_PATH=\"$HOME/.winemonogame\"" >> ~/.profile +echo -e "\nexport MGFXC_WINE_PATH=\"$HOME/.winemonogame\"" >> ~/.zprofile # cleanup rm -rf "$SCRIPT_DIR" From 44abb87e037f7e377b030f463bfb96d89fca7d1d Mon Sep 17 00:00:00 2001 From: "harry.cpp" Date: Sat, 15 Mar 2025 12:34:49 +0100 Subject: [PATCH 2/3] Use stable dotnet 9 sdk --- .../content/public/downloads/winesetup/net9_mgfxc_wine_setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/public/downloads/winesetup/net9_mgfxc_wine_setup.sh b/website/content/public/downloads/winesetup/net9_mgfxc_wine_setup.sh index a75a89f2..923b2405 100755 --- a/website/content/public/downloads/winesetup/net9_mgfxc_wine_setup.sh +++ b/website/content/public/downloads/winesetup/net9_mgfxc_wine_setup.sh @@ -50,7 +50,7 @@ eval "$WINEEXECUTABLE regedit crashdialog.reg" popd # get dotnet -DOTNET_URL="https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.100-rc.1.24452.12/dotnet-sdk-9.0.100-rc.1.24452.12-win-x64.zip" +DOTNET_URL="https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.104/dotnet-sdk-9.0.104-win-x64.zip" curl $DOTNET_URL --output "$SCRIPT_DIR/dotnet-sdk.zip" 7z x "$SCRIPT_DIR/dotnet-sdk.zip" -o"$WINEPREFIX/drive_c/windows/system32/" From 18922bd9498e6954d0b9857ba6759d9d08704cbb Mon Sep 17 00:00:00 2001 From: "harry.cpp" Date: Sat, 15 Mar 2025 12:42:03 +0100 Subject: [PATCH 3/3] Add symlink to dotnet 9 as well :( --- .../public/downloads/winesetup/net9_mgfxc_wine_setup.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/website/content/public/downloads/winesetup/net9_mgfxc_wine_setup.sh b/website/content/public/downloads/winesetup/net9_mgfxc_wine_setup.sh index 923b2405..b8df1bc4 100755 --- a/website/content/public/downloads/winesetup/net9_mgfxc_wine_setup.sh +++ b/website/content/public/downloads/winesetup/net9_mgfxc_wine_setup.sh @@ -64,5 +64,14 @@ cp -f "$SCRIPT_DIR/firefox_data/core/d3dcompiler_47.dll" "$WINEPREFIX/drive_c/wi echo -e "\nexport MGFXC_WINE_PATH=\"$HOME/.winemonogame\"" >> ~/.profile echo -e "\nexport MGFXC_WINE_PATH=\"$HOME/.winemonogame\"" >> ~/.zprofile +if ! type "wine64" > /dev/null 2>&1 +then + echo -e "\nexport PATH=\"\$PATH:$HOME/.winemonogame\"" >> ~/.profile + echo -e "\nexport PATH=\"\$PATH:$HOME/.winemonogame\"" >> ~/.zprofile + + WINEPATH=$(which $WINEEXECUTABLE) + ln -s "$WINEPATH" "$HOME/.winemonogame/wine64" +fi + # cleanup rm -rf "$SCRIPT_DIR"