diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index ee88492..1c74c1b 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -1,8 +1,12 @@ -You can help us in the development of the project on the website: boosty.to/linux-gaming.ru +You can help us in the development of the project on the website: https://linux-gaming.ru/donate/ ----------------------------------------- Changelog: -###Scripts version 2214### Дата: 04.08.2023 / Update download size: 250 megabytes. +###Scripts version 2215### Date: 18.08.2023 / Update download size: 8 megabytes. +* added script mirror: https://gitlab.eterfund.ru/Castro-Fidel/ +* creation of third-party (non-working) shortcuts by means of wine is disabled (when using wine versions other than proton) + +###Scripts version 2214### Date: 04.08.2023 / Update download size: 250 megabytes. * updated PROTON_LG to version 8-11 ###Scripts version 2213### Date: 03.08.2023 / Update download size: 250 megabytes. diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index ee48af3..611ef53 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,10 @@ ----------------------------------------- История изменений: +###Scripts version 2215### Дата: 18.08.2023 / Размер скачиваемого обновления: 8 мегабайт +* добавлено зеркало скриптов: https://gitlab.eterfund.ru/Castro-Fidel/ +* отключено создание сторонних (не работающих) ярлыков средствами wine (при использовании версий wine отличных от proton) + ###Scripts version 2214### Дата: 04.08.2023 / Размер скачиваемого обновления: 250 мегабайт * обновлен PROTON_LG до версии 8-11 * обновлен в "Авторы и спасибы" список бустеров которые хоть раз поддержали проект. diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 1ecb95d..9b05a1b 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -401,8 +401,9 @@ init_wine_ver () { fi fi - rm -f "${WINEDIR}"/*/*steam* &>/dev/null - rm -f "${WINEDIR}"/*/wine/*/*steam* &>/dev/null + rm -f "${WINEDIR}"/lib*/*steam* &>/dev/null + rm -f "${WINEDIR}"/lib*/wine/*/*steam* &>/dev/null + rm -f "${WINEDIR}"/lib*/wine/*-windows/winemenubuilder.exe &>/dev/null return 0 } @@ -847,7 +848,7 @@ pw_init_db () { if [[ "${PW_WINE_CPU_TOPOLOGY}" == "disabled" ]] && [[ -n "${WINE_CPU_TOPOLOGY}" ]] ; then export PW_WINE_CPU_TOPOLOGY="${WINE_CPU_TOPOLOGY}" fi - if ls "${PATH_TO_GAME}"/*_Data/Resources/ | grep "unity" &>/dev/null && \ + if ls "${PATH_TO_GAME}"/*_Data/Resources/ 2>/dev/null | grep "unity" &>/dev/null && \ [[ "${PW_WINE_CPU_TOPOLOGY}" == "disabled" ]] && \ [[ $(grep -c "^processor" /proc/cpuinfo) -gt "8" ]] then @@ -865,8 +866,22 @@ pw_port_update () { fi export scripts_install_ver=`cat "${PORT_WINE_TMP_PATH}/scripts_ver" | head -n 1` print_info "Check update..." - curl -s --list-only https://raw.githubusercontent.com/Castro-Fidel/PortWINE/master/data_from_portwine/scripts/var > "${PORT_WINE_TMP_PATH}/curent_var_ver" - [[ $? == 0 ]] && print_info "OK!" || print_info "ERROR!" + if curl -s --list-only --connect-timeout 3 "https://raw.githubusercontent.com/Castro-Fidel/PortWINE/master/data_from_portwine/scripts/var" > "${PORT_WINE_TMP_PATH}/curent_var_ver" + then + URL_FOR_CHANGELOG="https://raw.githubusercontent.com/Castro-Fidel/PortWINE/master/data_from_portwine" + URL_TO_PW_MASTER="https://github.com/Castro-Fidel/PortWINE/archive/refs/heads/master.tar.gz" + print_info "OK." + else + if curl -s --list-only --connect-timeout 3 "https://gitlab.eterfund.ru/Castro-Fidel/PortWINE/raw/master/data_from_portwine/scripts/var" > "${PORT_WINE_TMP_PATH}/curent_var_ver" + then + URL_FOR_CHANGELOG="https://gitlab.eterfund.ru/Castro-Fidel/PortWINE/raw/master/data_from_portwine" + URL_TO_PW_MASTER="https://gitlab.eterfund.ru/Castro-Fidel/PortWINE/-/archive/master/PortWINE-master.tar.gz" + print_info "OK." + else + print_error "Unable to determine the version on the server. Skip it..." + return 1 + fi + fi [[ ! -f "${PORT_WINE_TMP_PATH}/scripts_update_notifier" ]] && echo "1" > "${PORT_WINE_TMP_PATH}/scripts_update_notifier" read "scripts_update_not" < "${PORT_WINE_TMP_PATH}/scripts_update_notifier" if [[ "${scripts_update_not}" == "1" ]] ; then @@ -876,7 +891,7 @@ pw_port_update () { if [[ ! -z "${scripts_current_ver}" ]] && [[ "${scripts_current_ver}" -gt "${scripts_install_ver}" ]] ; then if [[ -f "${PW_WINELIB}/portable/bin/yad_v12_3" ]] ; then export pw_yad_v12_3="${PW_WINELIB}/portable/bin/yad_v12_3" - curl -s --list-only "https://raw.githubusercontent.com/Castro-Fidel/PortWINE/master/data_from_portwine/${PW_CHANGELOG_FILE}" | tee "${PORT_WINE_TMP_PATH}/curent_var_ver" | sszen + curl -s --list-only "${URL_FOR_CHANGELOG}/${PW_CHANGELOG_FILE}" | tee "${PORT_WINE_TMP_PATH}/curent_var_ver" | sszen CHANGLOG_NEWS=`cat "${PORT_WINE_TMP_PATH}/curent_var_ver" | sed "/Scripts version ${scripts_install_ver}/,$ d" | sed '1,/---/ d' ` xcsd=`"${pw_yad_v12_3}" --title "${scripts_upd2} v.${scripts_current_ver}" --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ --borders=3 --form --separator='%%%' --width=1200 --height=600 \ @@ -896,7 +911,7 @@ pw_port_update () { echo "######################################################" print_info "Update scripts..." try_remove_file "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz" - if try_download "github.com/Castro-Fidel/PortWINE/archive/refs/heads/master.tar.gz" "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz" ; then + if try_download "${URL_TO_PW_MASTER}" "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz" ; then if unpack_tar_gz "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz" "${PORT_WINE_TMP_PATH}" then create_new_dir "${PORT_WINE_TMP_PATH}/scripts_backup" diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index a646061..6284a6e 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -164,7 +164,7 @@ start_portwine () { var_winedlloverride_update "nvngx,_nvngx=" fi - grep '"renderer"=' "${WINEPREFIX}/user.reg" + grep '"renderer"=' "${WINEPREFIX}/user.reg" &>/dev/null if [[ "$?" == 0 ]] ; then sed -i /'"renderer"='/d "${WINEPREFIX}/user.reg" &>/dev/null sed -i /'renderer='/d "${WINEPREFIX}/winetricks.log" &>/dev/null @@ -421,9 +421,11 @@ start_portwine () { export ENABLE_VKBASALT=0 export PW_MANGOHUD=0 export WINE_FULLSCREEN_FSR=0 + elif [[ "${PW_VULKAN_USE}" == "4" ]] ; then + print_info "Use DAMAVAND (DirectX to wined3d vulkan)" + export WINE_D3D_CONFIG='renderer=vulkan' else print_info "Use VKD3D-PROTON, DXVK and D8VK (DirectX to vulkan)" - # export WINE_D3D_CONFIG='renderer=vulkan' if [[ "${PW_USE_WINE_DXGI}" == 1 ]] ; then export CP_DXVK_FILES="d3d11 d3d10core d3d9 dxvk_config openvr_api_dxvk" var_winedlloverride_update dxgi=b diff --git a/data_from_portwine/scripts/zen_yad_gui b/data_from_portwine/scripts/zen_yad_gui index f9c6e64..2859fd2 100755 --- a/data_from_portwine/scripts/zen_yad_gui +++ b/data_from_portwine/scripts/zen_yad_gui @@ -161,12 +161,14 @@ pw_gui_for_edit_db () { else CPU_LIMIT_VAR="disabled" fi - + + GET_REFRASH_RATE="30!45!60!75!120!144!165!240" + logical_cores=$(grep -c "^processor" /proc/cpuinfo) if [[ "${logical_cores}" -le "4" ]] ; then - GET_LOGICAL_CORE="$(seq -s! 1 $((${logical_cores} - 1)))" + GET_LOGICAL_CORE="1!$(seq -s! 1 $((${logical_cores} - 1)))" else - GET_LOGICAL_CORE="2!$(seq -s! 4 4 $((${logical_cores} - 1)))" + GET_LOGICAL_CORE="1!2!$(seq -s! 4 4 $((${logical_cores} - 1)))" fi unset ADD_CHK_BOX_EDIT_DB @@ -201,7 +203,7 @@ pw_gui_for_edit_db () { --field="${loc_gui_arg_exe}!${loc_gui_arg_exe_help} :CBE" "\\${LAUNCH_PARAMETERS[@]}!-dx11 -skipintro 1" \ --field=":LBL" "" \ --field="${loc_gui_cpu_limit}!${loc_gui_cpu_limit_help} :CB" "${CPU_LIMIT_VAR}!disabled!${GET_LOGICAL_CORE}" \ - --field="${loc_gui_mango_fps}!${loc_gui_mango_fps_help} :CB" "${FPS_LIMIT_VAR}!disabled!30!60!90!120" 2>/dev/null 1> "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" 2>/dev/null & + --field="${loc_gui_mango_fps}!${loc_gui_mango_fps_help} :CB" "${FPS_LIMIT_VAR}!disabled!${GET_REFRASH_RATE}" 2>/dev/null 1> "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" 2>/dev/null & "${pw_yad_v12_3}" --paned --key="$KEY_EDIT_DB_GUI" --title "EDIT_DB" --text-align=center --height="650" \ --text "${loc_gui_edit_db} ${PORTWINE_DB}\n ${loc_gui_edit_db_help}" --separator=" " --borders=3 \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \