rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-02-27 04:54:15 +01:00
Code Issues Projects Releases Wiki Activity

[meta] Actually remove all wine output from setup script

Browse Source
This commit is contained in:
Philip Rebohle 2018-09-14 14:55:45 +02:00
parent fca11582b5
commit 4439f94955
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
1 changed files with 13 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
utils/setup_dxvk.sh.in
View File

@ -96,21 +96,17 @@ fi
ret=0 ret=0
function removeOverride { function removeOverride {
echo -n ' [1/2] Removing override... ' echo " [1/2] Removing override... "
local out $wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v $1 /d builtin /f > /dev/null 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 "$out" echo "Failed"
exit 1 exit 1
fi fi
echo -e "$(sed -e 's|\r||g' <<< "$out.")"
local dll="$unix_sys_path/$1.dll" local dll="$unix_sys_path/$1.dll"
echo -n ' [2/2] Removing link... ' echo " [2/2] Removing link... "
if [ -h "$dll" ]; then if [ -h "$dll" ]; then
out=$(rm "$dll" 2>&1) out=$(rm "$dll" 2>&1)
if [ $? -eq 0 ]; then if [ $? -ne 0 ]; then
echo -e 'Done.'
else
ret=2 ret=2
echo -e "$out" echo -e "$out"
fi fi
@ -120,44 +116,18 @@ function removeOverride {
fi fi
} }
function checkOverride {
echo -n ' [1/2] Checking override... '
local ovr
ovr="$($wine reg query 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v $1)"
if [ $? -ne 0 ]; then
exit 1
fi
if [[ $ovr == *native* ]] && ! [[ $ovr == *builtin,native* ]]; then
echo -e 'OK.'
else
echo -e 'not set.'
ret=2
fi
echo -n " [2/2] Checking link to $1.$dll_ext... "
if [ "$(readlink -f "$unix_sys_path/$1.dll")" == "$(readlink -f "$dlls_dir/$1.$dll_ext")" ]; then
echo -e 'OK.'
else
echo -e 'not set.'
ret=2
fi
}
function createOverride { function createOverride {
echo -n ' [1/2] Creating override... ' echo " [1/2] Creating override... "
local out $wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v $1 /d native /f >/dev/null 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 "$out" echo -e "Failed"
exit 1 exit 1
fi fi
echo -e "$(sed -e 's|\r||g' <<< "$out.")" echo " [2/2] Creating link to $1.$dll_ext... "
echo -n " [2/2] Creating link to $1.$dll_ext... "
ln -sf "$dlls_dir/$1.$dll_ext" "$unix_sys_path/$1.dll" ln -sf "$dlls_dir/$1.$dll_ext" "$unix_sys_path/$1.dll"
if [ $? -eq 0 ]; then if [ $? -ne 0 ]; then
echo -e 'Done.' echo -e "Failed"
else exit 1
ret=2
echo -e "$out"
fi fi
} }
@ -165,15 +135,12 @@ case "$1" in
reset) reset)
fun=removeOverride fun=removeOverride
;; ;;
check)
fun=checkOverride
;;
'') '')
fun=createOverride fun=createOverride
;; ;;
*) *)
echo "Unrecognized option: $1" echo "Unrecognized option: $1"
echo "Usage: $0 [reset|check] [-q|--quiet] [-y|-n]" echo "Usage: $0 [reset] [-q|--quiet] [-y|-n]"
exit 1 exit 1
;; ;;
esac esac