CastroFidel/PortWINE
3
2
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

the conditions are optimized

Browse Source
This commit is contained in:
Mikhail Tergoev
2025-07-31 11:12:31 +03:00
parent 83ec48812b
commit 62fd39f7c6
1 changed files with 56 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
data_from_portwine/scripts/functions_helper
View File

@ -854,32 +854,32 @@ check_selinux () {
export -f check_selinux export -f check_selinux
check_vendor_gpu () { check_vendor_gpu () {
if [[ -n $PW_GPU_USE && $PW_GPU_USE != "disabled" ]] ; then check_pci_driver () {
case "${PW_GPU_USE,,}" in case "$1" in
*nvidia*) *nvidia*)
[[ -d /sys/bus/pci/drivers/nvidia ]] && VENDOR_GPU_USE="nvidia" [[ -d /sys/bus/pci/drivers/nvidia ]] && VENDOR_GPU_USE="nvidia"
[[ -d /sys/bus/pci/drivers/nouveau ]] && VENDOR_GPU_USE="nouveau" ;; [[ -d /sys/bus/pci/drivers/nouveau ]] && VENDOR_GPU_USE="nouveau"
;;
*amd*) *amd*)
[[ -d /sys/bus/pci/drivers/amdgpu ]] && VENDOR_GPU_USE="amd" ;; [[ -d /sys/bus/pci/drivers/amdgpu ]] && VENDOR_GPU_USE="amd"
;;
*intel*) *intel*)
[[ -d /sys/bus/pci/drivers/i915 ]] && VENDOR_GPU_USE="intel" ;; [[ -d /sys/bus/pci/drivers/i915 ]] && VENDOR_GPU_USE="intel"
esac ;;
elif command -v glxinfo &>/dev/null ; then *)
pw_check_glxinfo
case "$(<"${PW_TMPFS_PATH}/glxinfo.tmp" tr '[:upper:]' '[:lower:]')" in
*nvidia*)
[[ -d /sys/bus/pci/drivers/nvidia ]] && VENDOR_GPU_USE="nvidia" [[ -d /sys/bus/pci/drivers/nvidia ]] && VENDOR_GPU_USE="nvidia"
[[ -d /sys/bus/pci/drivers/nouveau ]] && VENDOR_GPU_USE="nouveau" ;; [[ -d /sys/bus/pci/drivers/nouveau ]] && VENDOR_GPU_USE="nouveau"
*amd*) [[ -d /sys/bus/pci/drivers/amdgpu ]] && VENDOR_GPU_USE="amd"
[[ -d /sys/bus/pci/drivers/amdgpu ]] && VENDOR_GPU_USE="amd" ;; [[ -d /sys/bus/pci/drivers/i915 ]] && VENDOR_GPU_USE="intel"
*intel*) ;;
[[ -d /sys/bus/pci/drivers/i915 ]] && VENDOR_GPU_USE="intel" ;;
esac esac
else }
[[ -d /sys/bus/pci/drivers/nvidia ]] && VENDOR_GPU_USE="nvidia"
[[ -d /sys/bus/pci/drivers/nouveau ]] && VENDOR_GPU_USE="nouveau" if [[ -n $PW_GPU_USE && $PW_GPU_USE != "disabled" ]]
[[ -d /sys/bus/pci/drivers/amdgpu ]] && VENDOR_GPU_USE="amd" then check_pci_driver "${PW_GPU_USE,,}"
[[ -d /sys/bus/pci/drivers/i915 ]] && VENDOR_GPU_USE="intel" elif pw_check_glxinfo
then check_pci_driver "$(<"${PW_TMPFS_PATH}/glxinfo.tmp" tr '[:upper:]' '[:lower:]')"
else check_pci_driver
fi fi
echo "$VENDOR_GPU_USE" echo "$VENDOR_GPU_USE"
@ -2861,16 +2861,12 @@ pw_check_dxvk () {
# какие карты в приоритете, если не выбран изначально PW_GPU_USE # какие карты в приоритете, если не выбран изначально PW_GPU_USE
if [[ -n ${SELECTED_VULKAN_GPU[1]} ]] ; then if [[ -n ${SELECTED_VULKAN_GPU[1]} ]] ; then
for elem in "${SELECTED_VULKAN_GPU[@]}"; do for elem in "${SELECTED_VULKAN_GPU[@]}"; do
elem_lower=${elem,,} case ${elem,,} in
if [[ $elem_lower =~ nvidia ]]; then *nvidia*) nvidia_group+=("$elem") ;;
nvidia_group+=("$elem") *amd*) amd_group+=("$elem") ;;
elif [[ $elem_lower =~ amd ]]; then *intel*) intel_group+=("$elem") ;;
amd_group+=("$elem") *) other_group+=("$elem") ;;
elif [[ $elem_lower =~ intel ]]; then esac
intel_group+=("$elem")
else
other_group+=("$elem")
fi
done done
unset SELECTED_VULKAN_GPU unset SELECTED_VULKAN_GPU
SELECTED_VULKAN_GPU_NEW=( SELECTED_VULKAN_GPU_NEW=(
@ -6725,23 +6721,40 @@ gui_userconf () {
SORT_WITH_TIME="${PW_ADD_SETTINGS_UC[10]}" SORT_WITH_TIME="${PW_ADD_SETTINGS_UC[10]}"
PW_VULKAN_UNLOCKED="${PW_ADD_SETTINGS_UC[11]}" PW_VULKAN_UNLOCKED="${PW_ADD_SETTINGS_UC[11]}"
[[ $DOWNLOAD_STEAM_GRID =~ (${translations[Enabled]}|${translations[Enable]}) ]] && DOWNLOAD_STEAM_GRID="1" if [[ $DOWNLOAD_STEAM_GRID =~ (${translations[Enabled]}|${translations[Enable]}) ]]
[[ $DOWNLOAD_STEAM_GRID =~ (${translations[Disabled]}|${translations[Disable]}) ]] && DOWNLOAD_STEAM_GRID="0" then DOWNLOAD_STEAM_GRID="1"
else DOWNLOAD_STEAM_GRID="0"
fi
[[ $PW_WINE_DPI_VALUE == "${translations[Recommended value]}" ]] && PW_WINE_DPI_VALUE="recommended" [[ $PW_WINE_DPI_VALUE == "${translations[Recommended value]}" ]] && PW_WINE_DPI_VALUE="recommended"
[[ $GUI_THEME == "${translations[default]}" ]] && GUI_THEME="default"
[[ $GUI_THEME == "${translations[compact]}" ]] && GUI_THEME="compact" case $GUI_THEME in
[[ $GUI_THEME == "${translations[classic]}" ]] && GUI_THEME="classic" "${translations[default]}") GUI_THEME="default" ;;
[[ $GTK_THEME == "${translations[default]}" ]] && unset GTK_THEME "${translations[compact]}") GUI_THEME="compact" ;;
[[ $GTK_THEME =~ ${translations[light]} ]] && GTK_THEME=${GTK_THEME//${translations[light]}/light} "${translations[classic]}") GUI_THEME="classic" ;;
[[ $GTK_THEME =~ ${translations[dark]} ]] && GTK_THEME=${GTK_THEME//${translations[dark]}/dark} esac
[[ $DESKTOP_WITH_TIME == "${translations[Show in hours and minutes]}" ]] && DESKTOP_WITH_TIME="posnumber1"
[[ $DESKTOP_WITH_TIME == "${translations[Show in days, hours, minutes]}" ]] && DESKTOP_WITH_TIME="posnumber2" case $GTK_THEME in
[[ $SORT_WITH_TIME == "${translations[According to last launch]}" ]] && SORT_WITH_TIME="lastlaunch" "${translations[default]}") unset GTK_THEME ;;
[[ $SORT_WITH_TIME == "${translations[By time]}" ]] && SORT_WITH_TIME="bytime" "${translations[light]}") GTK_THEME=${GTK_THEME//${translations[light]}/light} ;;
"${translations[dark]}") GTK_THEME=${GTK_THEME//${translations[dark]}/dark} ;;
esac
if [[ $DESKTOP_WITH_TIME == "${translations[Show in hours and minutes]}" ]]
then DESKTOP_WITH_TIME="posnumber1"
else DESKTOP_WITH_TIME="posnumber2"
fi
if [[ $SORT_WITH_TIME == "${translations[According to last launch]}" ]]
then SORT_WITH_TIME="lastlaunch"
else SORT_WITH_TIME="bytime"
fi
[[ $PW_GPU_USE == "${translations[The graphics card does not support Vulkan]}" ]] && PW_GPU_USE="disabled" [[ $PW_GPU_USE == "${translations[The graphics card does not support Vulkan]}" ]] && PW_GPU_USE="disabled"
[[ $PW_VULKAN_UNLOCKED == "${translations[default]}" ]] && PW_VULKAN_UNLOCKED="default"
if [[ $PW_VULKAN_UNLOCKED == "${translations[unlock]}" || $PW_VULKAN_UNLOCKED == "${translations[unlocked]}" ]] if [[ $PW_VULKAN_UNLOCKED == "${translations[unlock]}" || $PW_VULKAN_UNLOCKED == "${translations[unlocked]}" ]]
then PW_VULKAN_UNLOCKED="unlocked" then PW_VULKAN_UNLOCKED="unlocked"
else PW_VULKAN_UNLOCKED="default"
fi fi
edit_user_conf_from_gui MIRROR BRANCH PW_GUI_START DOWNLOAD_STEAM_GRID PW_GPU_USE PW_WINE_DPI_VALUE PW_SOUND_DRIVER_USE \ edit_user_conf_from_gui MIRROR BRANCH PW_GUI_START DOWNLOAD_STEAM_GRID PW_GPU_USE PW_WINE_DPI_VALUE PW_SOUND_DRIVER_USE \