backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

[general] More consistent use of $wine in setup script

Browse Source 
Allows users to set this as an environment variable before running
the setup script, which may be useful on distributions shipping
non-standard packages.
This commit is contained in:
Philip Rebohle 2018-05-07 09:34:42 +02:00
parent 757be61b70
commit db7332972e
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wine_utils/setup_dxvk.sh.in
View File

@ -10,10 +10,10 @@ if [ ! -f "$dlls_dir/d3d11.dll" ] || [ ! -f "$dlls_dir/dxgi.dll" ]; then
exit 1 exit 1
fi fi
[ -z "$wine" ] && wine="wine"
if [ $build_arch == "x86_64" ]; then if [ $build_arch == "x86_64" ]; then
wine=wine64 wine="${wine}64"
else
wine=wine
fi fi
quiet=false quiet=false
@ -82,7 +82,7 @@ ret=0
function removeOverride { function removeOverride {
echo -n ' [1/2] Removing override... ' echo -n ' [1/2] Removing override... '
local out 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 if [ $? -ne 0 ]; then
echo -e "\\e[1;31m$out\\e[0m" echo -e "\\e[1;31m$out\\e[0m"
exit 1 exit 1
@ -108,7 +108,7 @@ function checkOverride {
echo -n ' [1/2] Checking override... ' echo -n ' [1/2] Checking override... '
echo -en '\e[1;31m' echo -en '\e[1;31m'
local ovr 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 if [ $? -ne 0 ]; then
echo -en '\e[1;0m' echo -en '\e[1;0m'
exit 1 exit 1
@ -132,7 +132,7 @@ function checkOverride {
function createOverride { function createOverride {
echo -n ' [1/2] Creating override... ' echo -n ' [1/2] Creating override... '
local out 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 if [ $? -ne 0 ]; then
echo -e "\\e[1;31m$out\\e[0m" echo -e "\\e[1;31m$out\\e[0m"
exit 1 exit 1