From 2dae99e748441a96dd737ac81d2772a359ba63c9 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Mon, 7 May 2018 09:47:37 +0200 Subject: [PATCH] [general] Test whether wine executable is actually wine --- wine_utils/setup_dxvk.sh.in | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/wine_utils/setup_dxvk.sh.in b/wine_utils/setup_dxvk.sh.in index ec99fc86..a153965f 100755 --- a/wine_utils/setup_dxvk.sh.in +++ b/wine_utils/setup_dxvk.sh.in @@ -10,10 +10,18 @@ if [ ! -f "$dlls_dir/d3d11.dll" ] || [ ! -f "$dlls_dir/dxgi.dll" ]; then exit 1 fi -[ -z "$wine" ] && wine="wine" +if [ -z "$wine" ]; then + if [ $build_arch == "x86_64" ]; then + wine="wine64" + else + wine="wine" + fi +fi -if [ $build_arch == "x86_64" ]; then - wine="${wine}64" +winever=`$wine --version | grep wine` +if [ -z "$winever" ]; then + echo "$wine:"' Not a wine executable. Check your $wine.' >&2 + exit 1 fi quiet=false