From db7332972e04db4c1409ac7e6a671564a132da2d Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Mon, 7 May 2018 09:34:42 +0200
Subject: [PATCH] [general] More consistent use of $wine in setup script

Allows users to set this as an environment variable before running
the setup script, which may be useful on distributions shipping
non-standard packages.
---
 wine_utils/setup_dxvk.sh.in | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/wine_utils/setup_dxvk.sh.in b/wine_utils/setup_dxvk.sh.in
index 72c6a0cc..ec99fc86 100755
--- a/wine_utils/setup_dxvk.sh.in
+++ b/wine_utils/setup_dxvk.sh.in
@@ -10,10 +10,10 @@ if [ ! -f "$dlls_dir/d3d11.dll" ] || [ ! -f "$dlls_dir/dxgi.dll" ]; then
     exit 1
 fi
 
+[ -z "$wine" ] && wine="wine"
+
 if [ $build_arch == "x86_64" ]; then
-    wine=wine64
-else
-    wine=wine
+    wine="${wine}64"
 fi
 
 quiet=false
@@ -82,7 +82,7 @@ ret=0
 function removeOverride {
     echo -n '    [1/2] Removing override... '
     local out
-    out=$(wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v $1 /d builtin /f 2>&1)
+    out=$($wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v $1 /d builtin /f 2>&1)
     if [ $? -ne 0 ]; then
         echo -e "\\e[1;31m$out\\e[0m"
         exit 1
@@ -108,7 +108,7 @@ function checkOverride {
     echo -n '    [1/2] Checking override... '
     echo -en '\e[1;31m'
     local ovr
-    ovr="$(wine reg query 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v $1)"
+    ovr="$($wine reg query 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v $1)"
     if [ $? -ne 0 ]; then
         echo -en '\e[1;0m'
         exit 1
@@ -132,7 +132,7 @@ function checkOverride {
 function createOverride {
     echo -n '    [1/2] Creating override... '
     local out
-    out=$(wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v $1 /d native /f 2>&1)
+    out=$($wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v $1 /d native /f 2>&1)
     if [ $? -ne 0 ]; then
         echo -e "\\e[1;31m$out\\e[0m"
         exit 1