mirror of
https://github.com/the-sane/lug-helper.git
synced 2025-04-24 09:19:11 +00:00
Remove wow64 wine check
This commit is contained in:
parent
6bb397a9ca
commit
f13471959a
@ -945,49 +945,6 @@ wine_check() {
|
|||||||
else
|
else
|
||||||
system_wine_ok="true"
|
system_wine_ok="true"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# If system wine passes the above checks, also check for the new wow64 mode that currently does not work
|
|
||||||
if [ "$system_wine_ok" = "true" ]; then
|
|
||||||
# Get paths to wine and wineserver binaries
|
|
||||||
wine_bin="$(command -v wine)"
|
|
||||||
wineserver_bin="$(command -v wineserver)"
|
|
||||||
wineboot_bin="$(command -v wineboot)"
|
|
||||||
|
|
||||||
# Determine the architecture of wine binary
|
|
||||||
wine_bin_arch="$(get_file_arch "${wine_bin}")"
|
|
||||||
|
|
||||||
# If unable to determine architecture, attempt alternative methods
|
|
||||||
if [ -z "${wine_bin_arch}" ]; then
|
|
||||||
if [ -x "${wineboot_bin}" ]; then
|
|
||||||
wine_bin_dir="$(dirname "$(readlink -f "${wineboot_bin}" 2>/dev/null)" 2>/dev/null)"
|
|
||||||
if [ -x "${wine_bin_dir}/wine" ]; then
|
|
||||||
wine_bin_arch="$(get_file_arch "${wine_bin_dir}/wine")"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Determine the architecture of wineserver binary
|
|
||||||
wineserver_bin_arch="$(get_file_arch "${wineserver_bin}")"
|
|
||||||
|
|
||||||
# If unable to determine architecture, attempt alternative methods
|
|
||||||
if [ -z "${wineserver_bin_arch}" ]; then
|
|
||||||
if [ -x "${wineboot_bin}" ]; then
|
|
||||||
wine_bin_dir="$(dirname "$(readlink -f "${wineboot_bin}" 2>/dev/null)" 2>/dev/null)"
|
|
||||||
if [ -x "${wine_bin_dir}/wineserver64" ]; then
|
|
||||||
wineserver_bin_arch="$(get_file_arch "${wine_bin_dir}/wineserver64")"
|
|
||||||
elif [ -x "${wine_bin_dir}/wineserver32" ]; then
|
|
||||||
wineserver_bin_arch="$(get_file_arch "${wine_bin_dir}/wineserver32")"
|
|
||||||
elif [ -x "${wine_bin_dir}/wineserver" ]; then
|
|
||||||
wineserver_bin_arch="$(get_file_arch "${wine_bin_dir}/wineserver")"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check for the new WOW64, 32bit, or unknown states and then fail the check
|
|
||||||
if [ "${wineserver_bin_arch}" = "${wine_bin_arch}" ] || [ -z "${wineserver_bin_arch}" ] || [ -z "${wine_bin_arch}" ]; then
|
|
||||||
system_wine_ok="false"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# Determine the architecture of a binary file
|
# Determine the architecture of a binary file
|
||||||
@ -2718,7 +2675,7 @@ install_game_wine() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Add registry key that prevents wine from creating unnecessary file type associations
|
# Add registry key that prevents wine from creating unnecessary file type associations
|
||||||
"$wine_path"/wine reg add "HKEY_CURRENT_USER\Software\Wine\FileOpenAssociations" /v Enable /d N >>"$tmp_install_log" 2>&1
|
"$wine_path"/wine reg add "HKEY_CURRENT_USER\Software\Wine\FileOpenAssociations" /v Enable /d N /f >>"$tmp_install_log" 2>&1
|
||||||
|
|
||||||
# Run the installer
|
# Run the installer
|
||||||
debug_print continue "Installing RSI Launcher. Please wait; this will take a moment..."
|
debug_print continue "Installing RSI Launcher. Please wait; this will take a moment..."
|
||||||
|
Loading…
x
Reference in New Issue
Block a user