From 18397d12691b9ff8e74cdf2dbf279982149ee496 Mon Sep 17 00:00:00 2001 From: "harry.cpp" Date: Wed, 12 Mar 2025 16:54:12 +0100 Subject: [PATCH] [WINE} Fix Wine script to work for version 10 --- .../downloads/winesetup/net6_mgfxc_wine_setup.sh | 14 ++++++++++---- .../downloads/winesetup/net8_mgfxc_wine_setup.sh | 16 +++++++++++----- .../downloads/winesetup/net9_mgfxc_wine_setup.sh | 16 +++++++++++----- 3 files changed, 32 insertions(+), 14 deletions(-) mode change 100644 => 100755 website/content/public/downloads/winesetup/net6_mgfxc_wine_setup.sh mode change 100644 => 100755 website/content/public/downloads/winesetup/net8_mgfxc_wine_setup.sh mode change 100644 => 100755 website/content/public/downloads/winesetup/net9_mgfxc_wine_setup.sh diff --git a/website/content/public/downloads/winesetup/net6_mgfxc_wine_setup.sh b/website/content/public/downloads/winesetup/net6_mgfxc_wine_setup.sh old mode 100644 new mode 100755 index 13aae15c..082411aa --- a/website/content/public/downloads/winesetup/net6_mgfxc_wine_setup.sh +++ b/website/content/public/downloads/winesetup/net6_mgfxc_wine_setup.sh @@ -3,9 +3,15 @@ # so that mgfxc can be run on Linux / macOS systems. # check dependencies -if ! type "wine64" > /dev/null 2>&1 +WINEEXECUTABLE="wine64" +if ! type "$WINEEXECUTABLE" > /dev/null 2>&1 then - echo "wine64 not found" + WINEEXECUTABLE="wine" +fi + +if ! type "$WINEEXECUTABLE" > /dev/null 2>&1 +then + echo "$WINEEXECUTABLE not found" exit 1 fi @@ -18,7 +24,7 @@ fi # init wine stuff export WINEARCH=win64 export WINEPREFIX=$HOME/.winemonogame -wine64 wineboot +eval "$WINEEXECUTABLE wineboot" TEMP_DIR="${TMPDIR:-/tmp}" SCRIPT_DIR="$TEMP_DIR/winemg2" @@ -32,7 +38,7 @@ REGEDIT4 _EOF_ pushd $SCRIPT_DIR -wine64 regedit crashdialog.reg +eval "$WINEEXECUTABLE regedit crashdialog.reg" popd # get dotnet diff --git a/website/content/public/downloads/winesetup/net8_mgfxc_wine_setup.sh b/website/content/public/downloads/winesetup/net8_mgfxc_wine_setup.sh old mode 100644 new mode 100755 index bd807623..4f8ccc6c --- a/website/content/public/downloads/winesetup/net8_mgfxc_wine_setup.sh +++ b/website/content/public/downloads/winesetup/net8_mgfxc_wine_setup.sh @@ -3,9 +3,15 @@ # so that mgfxc can be run on Linux / macOS systems. # check dependencies -if ! type "wine64" > /dev/null 2>&1 +WINEEXECUTABLE="wine64" +if ! type "$WINEEXECUTABLE" > /dev/null 2>&1 then - echo "wine64 not found" + WINEEXECUTABLE="wine" +fi + +if ! type "$WINEEXECUTABLE" > /dev/null 2>&1 +then + echo "$WINEEXECUTABLE not found" exit 1 fi @@ -17,7 +23,7 @@ fi # wine 8 is the minimum requirement for dotnet 8 # wine --version will output "wine-#.# (Distro #.#.#)" or "wine-#.#" -WINE_VERSION=$(wine64 --version 2>&1 | grep -o 'wine-..' | sed 's/wine-//' | sed 's/\.//') +WINE_VERSION=$($WINEEXECUTABLE --version 2>&1 | grep -o 'wine-..' | sed 's/wine-//' | sed 's/\.//') if (( $WINE_VERSION < 8 )); then echo "Wine version $WINE_VERSION is below the minimum required version (8.0)." exit 1 @@ -26,7 +32,7 @@ fi # init wine stuff export WINEARCH=win64 export WINEPREFIX=$HOME/.winemonogame -wine64 wineboot +eval "$WINEEXECUTABLE wineboot" TEMP_DIR="${TMPDIR:-/tmp}" SCRIPT_DIR="$TEMP_DIR/winemg2" @@ -40,7 +46,7 @@ REGEDIT4 _EOF_ pushd $SCRIPT_DIR -wine64 regedit crashdialog.reg +eval "$WINEEXECUTABLE regedit crashdialog.reg" popd # get dotnet diff --git a/website/content/public/downloads/winesetup/net9_mgfxc_wine_setup.sh b/website/content/public/downloads/winesetup/net9_mgfxc_wine_setup.sh old mode 100644 new mode 100755 index 8f911e76..fa1d912d --- a/website/content/public/downloads/winesetup/net9_mgfxc_wine_setup.sh +++ b/website/content/public/downloads/winesetup/net9_mgfxc_wine_setup.sh @@ -3,9 +3,15 @@ # so that mgfxc can be run on Linux / macOS systems. # check dependencies -if ! type "wine64" > /dev/null 2>&1 +WINEEXECUTABLE="wine64" +if ! type "$WINEEXECUTABLE" > /dev/null 2>&1 then - echo "wine64 not found" + WINEEXECUTABLE="wine" +fi + +if ! type "$WINEEXECUTABLE" > /dev/null 2>&1 +then + echo "$WINEEXECUTABLE not found" exit 1 fi @@ -17,7 +23,7 @@ fi # wine 8 is the minimum requirement for dotnet 8 # wine --version will output "wine-#.# (Distro #.#.#)" or "wine-#.#" -WINE_VERSION=$(wine64 --version 2>&1 | grep -o 'wine-..' | sed 's/wine-//' | sed 's/\.//') +WINE_VERSION=$($WINEEXECUTABLE --version 2>&1 | grep -o 'wine-..' | sed 's/wine-//' | sed 's/\.//') if (( $WINE_VERSION < 8 )); then echo "Wine version $WINE_VERSION is below the minimum required version (8.0)." exit 1 @@ -26,7 +32,7 @@ fi # init wine stuff export WINEARCH=win64 export WINEPREFIX=$HOME/.winemonogame -wine64 wineboot +eval "$WINEEXECUTABLE wineboot" TEMP_DIR="${TMPDIR:-/tmp}" SCRIPT_DIR="$TEMP_DIR/winemg2" @@ -40,7 +46,7 @@ REGEDIT4 _EOF_ pushd $SCRIPT_DIR -wine64 regedit crashdialog.reg +eval "$WINEEXECUTABLE regedit crashdialog.reg" popd # get dotnet