Commit 8aee21ac authored by Mikhail Tergoev's avatar Mikhail Tergoev

minor fixed NVAPI func.

parent 8783e800
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
----------------------------------------- -----------------------------------------
История изменений: История изменений:
###Scripts version 2322### / Дата: 16.07.2024 / Размер скачиваемого обновления: 4 мегабайта
* обновлен испанский перевод
###Scripts version 2321### / Дата: 15.07.2024 / Размер скачиваемого обновления: 190 мегабайт ###Scripts version 2321### / Дата: 15.07.2024 / Размер скачиваемого обновления: 190 мегабайт
* обновлен WINE_LG до версии "9-12" * обновлен WINE_LG до версии "9-12"
* обновлены версии: * обновлены версии:
......
...@@ -142,24 +142,30 @@ try_copy_file_with_checksums () { ...@@ -142,24 +142,30 @@ try_copy_file_with_checksums () {
then then
checksum1=($(sha256sum "$1")) checksum1=($(sha256sum "$1"))
if [[ ! -f "$2" ]] ; then if [[ ! -f "$2" ]] ; then
cp -f "$1" "$2" \ if cp -f "$1" "$2" ; then
&& echo $checksum1 > "$2.sha256sum" \ echo "${checksum1[0]}" > "$2.sha256sum"
&& return 0 || return 1 return 0
else
return 1
fi
else else
if [[ ! -f "$2.sha256sum" ]] ; then if [[ ! -f "$2.sha256sum" ]] ; then
checksum2=($(sha256sum "$2")) checksum2=($(sha256sum "$2"))
echo $checksum2 > "$2.sha256sum" echo "${checksum2[0]}" > "$2.sha256sum"
else else
checksum2=$(<"$2.sha256sum") checksum2=$(<"$2.sha256sum")
fi fi
fi fi
if [[ "$checksum1" == "$checksum2" ]] ; then if [[ "${checksum1[0]}" == "${checksum2[0]}" ]] ; then
return 0 return 0
else else
try_remove_file "$2" \ try_remove_file "$2"
&& cp -f "$1" "$2" \ if cp -f "$1" "$2" ; then
&& echo $checksum1 > "$2.sha256sum" \ echo "${checksum1[0]}" > "$2.sha256sum"
&& return 0 || return 1 return 0
else
return 1
fi
fi fi
else else
[[ -e "$2/$(basename "$1")" ]] && rm -f "$2/$(basename "$1")" [[ -e "$2/$(basename "$1")" ]] && rm -f "$2/$(basename "$1")"
...@@ -1887,9 +1893,6 @@ start_portwine () { ...@@ -1887,9 +1893,6 @@ start_portwine () {
fi fi
} }
try_remove_file "${WINEPREFIX}/drive_c/windows/syswow64/nvml.dll"
try_remove_file "${WINEPREFIX}/drive_c/windows/system32/nvml.dll"
if [[ "${PW_USE_FAKE_DLSS}" == "1" ]] \ if [[ "${PW_USE_FAKE_DLSS}" == "1" ]] \
&& [[ -d "${PW_PLUGINS_PATH}/fake_dlss/${PW_FAKE_DLSS_VER}/" ]] && [[ -d "${PW_PLUGINS_PATH}/fake_dlss/${PW_FAKE_DLSS_VER}/" ]]
then then
...@@ -1916,6 +1919,10 @@ start_portwine () { ...@@ -1916,6 +1919,10 @@ start_portwine () {
var_winedlloverride_update "nvngx,_nvngx,nvapi,nvapi64=n;nvcuda=b" var_winedlloverride_update "nvngx,_nvngx,nvapi,nvapi64=n;nvcuda=b"
else else
DXVK_ENABLE_NVAPI="0" DXVK_ENABLE_NVAPI="0"
for rm_dll in "nvngx.ini" "nvngx.dll" "_nvngx.dll" ; do
try_remove_file "${WINEPREFIX}/drive_c/windows/syswow64/$rm_dll"
try_remove_file "${WINEPREFIX}/drive_c/windows/system32/$rm_dll"
done
enabled_fake_nvidia_videocard 0 enabled_fake_nvidia_videocard 0
var_winedlloverride_update "nvngx,_nvngx=" var_winedlloverride_update "nvngx,_nvngx="
fi fi
......
#!/usr/bin/env bash #!/usr/bin/env bash
#Author: Castro-Fidel (linux-gaming.ru) #Author: Castro-Fidel (linux-gaming.ru)
#SCRIPTS_NEXT_VERSION=2321 #SCRIPTS_NEXT_VERSION=2322
#SCRIPTS_STABLE_VERSION=2320 #SCRIPTS_STABLE_VERSION=2320
######################################################################## ########################################################################
export LANGUAGES_LIST="ru es" export LANGUAGES_LIST="ru es"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment