diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 4dcf03a4..d4c8647e 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,10 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2247### Date: 23.01.2024 / Download update size: 8 megabytes +* improved operation of the portable version of gamemode +* added cleaning of the data/tmp directory from broken (undocumented) archives before launching PortProton + ###Scripts version 2246### Date: 20.01.2024 / Download update size: 8 megabytes * HOTFIX - fixed the launch of Modern Warships after its update * HOTFIX - fixed launch with gamescope diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 75901f82..b692f58e 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,11 @@ ----------------------------------------- История изменений: +###Scripts version 2247### Дата: 23.01.2024 / Размер скачиваемого обновления: 8 мегабайт +* улучшена работа портативной версии gamemode +* исправление опечаток +* добавлена очистка data/tmp каталога от битых (недокаченных) архивов, перед запуском PortProton + ###Scripts version 2246### Дата: 20.01.2024 / Размер скачиваемого обновления: 8 мегабайт * HOTFIX - исправлен запуск Modern Warships после его обновления * HOTFIX - исправлен запуск с gamescope diff --git a/data_from_portwine/img/gui/bsr.png b/data_from_portwine/img/gui/bsr.png index dd1c2592..2ecfc0d2 100644 Binary files a/data_from_portwine/img/gui/bsr.png and b/data_from_portwine/img/gui/bsr.png differ diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index b3d5cdb8..a0d10295 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -507,6 +507,9 @@ pw_init_runtime () { else export PRESSURE_VESSEL_FILESYSTEMS_RW="${PWRTMRW}" fi done + + # drop portable: libssl 32-bit + try_remove_file "${PW_WINELIB}/portable/lib/lib32/libssl.so.1.1" print_info "RUNTIME is enabled" } @@ -1004,7 +1007,6 @@ pw_port_update () { return 0 } - update_winetricks () { W_TRX_URL="https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks" W_TRX_EXT_VER="$(curl -s --list-only ${W_TRX_URL} | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')" diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index 3a4b125a..d3fac7af 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -36,7 +36,7 @@ if [[ "${update_loc}" == "RUS" ]] ; then export loc_create_pfx_backup_path="РЕЗЕРВНОЕ КОПИРОВАНИЕ ПРЕФИКСА В..." - export loc_gui_wine_uninstaller="Удаление программм" + export loc_gui_wine_uninstaller="Удаление программ" export loc_gui_wine_cfg="Настройка префикса" export loc_gui_wine_file="Файловый менеджер" export loc_gui_wine_cmd="Командная строка" diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 1b2473e2..6e504273 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -267,10 +267,18 @@ start_portwine () { fi if [[ "$PW_USE_GAMEMODE" = "1" ]] ; then export GAMEMODERUN=1 - PW_GAMEMODERUN_SLR="gamemoderun" pkill gamemoded sleep 0.1 - "${PW_WINELIB}/portable/bin/gamemoded" > /dev/null 2>&1 & + + GAMEMODEAUTO_NAME="libgamemodeauto.so.0" + if [[ ! -z "${PW_LD_PRELOAD}" ]] + then export PW_LD_PRELOAD="${PW_LD_PRELOAD}:${GAMEMODEAUTO_NAME}" + else export PW_LD_PRELOAD="${GAMEMODEAUTO_NAME}" + fi + + env LD_LIBRARY_PATH="${PW_WINELIB}/portable/lib/lib64:${PW_WINELIB}/portable/lib/lib32" \ + "${PW_WINELIB}/portable/bin/gamemoded" &>/dev/null & + print_info "Gamemod will be launched." else export GAMEMODERUN=0 @@ -284,6 +292,9 @@ start_portwine () { create_new_dir "${WINEPREFIX}/dosdevices" create_new_dir "${WINEPREFIX}/drive_c/windows/syswow64/" create_new_dir "${WINEPREFIX}/drive_c/windows/system32/" + create_new_dir "${WINEPREFIX}/drive_c/tmp/.private/$USER/" + create_new_dir "${WINEPREFIX}/drive_c/tmp/.private/steamuser/" + [ ! -d "${WINEPREFIX}/dosdevices/c:" ] && try_force_link_dir "${WINEPREFIX}/drive_c/" "${WINEPREFIX}/dosdevices/c:" [ ! -d "${WINEPREFIX}/dosdevices/z:" ] && try_force_link_dir "/" "${WINEPREFIX}/dosdevices/z:" [ ! -d "${WINEPREFIX}/dosdevices/h:" ] && try_force_link_dir "$HOME" "${WINEPREFIX}/dosdevices/h:" @@ -675,8 +686,9 @@ pw_run () { pw_mangohud_check pw_vkbasalt_check PW_LOG_TO_FILE="${PORT_WINE_PATH}/${portname}.log" - print_var "WINEDIR" "WINEPREFIX" "WINEDLLOVERRIDES" "PATH_TO_GAME" "PW_WINE_USE" "PW_VULKAN_USE" "VULKAN_DRIVER_NAME" "VULKAN_API_DRIVER_VERSION" \ - "VKD3D_CONFIG" "PW_LD_LIBRARY_PATH" "PATH" "WINEESYNC" "WINEFSYNC" "WINEFSYNC_FUTEX2" "WINEDLLPATH" "WINE_CPU_TOPOLOGY" "PW_RUN_GAMESCOPE" + print_var "WINEDIR" "WINEPREFIX" "WINEDLLOVERRIDES" "PATH_TO_GAME" "PW_WINE_USE" "PW_VULKAN_USE" "VULKAN_DRIVER_NAME" + print_var "VULKAN_API_DRIVER_VERSION" "VKD3D_CONFIG" "PW_LD_LIBRARY_PATH" "PATH" "WINEESYNC" "WINEFSYNC" "WINEFSYNC_FUTEX2" + print_var "WINEDLLPATH" "WINE_CPU_TOPOLOGY" "PW_RUN_GAMESCOPE" "LD_LIBRARY_PATH" kill -s SIGUSR1 "$PW_YAD_PID_PFX_COVER_UI" &>/dev/null if [[ "${PW_LOG}" == 1 ]] ; then echo "WINEDLLOVERRIDES=${WINEDLLOVERRIDES}" >> "${PW_LOG_TO_FILE}" @@ -691,7 +703,6 @@ pw_run () { LD_PRELOAD="${PW_LD_PRELOAD}" \ VK_LAYER_PATH="${PW_VK_LAYER_PATH}" \ VK_INSTANCE_LAYERS=${PW_VK_INSTANCE_LAYERS} \ - ${PW_GAMEMODERUN_SLR} \ ${PW_MANGOHUD_SLR} \ "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]} &>>"${PW_LOG_TO_FILE}" else @@ -709,7 +720,6 @@ pw_run () { LD_PRELOAD="${PW_LD_PRELOAD}" \ VK_LAYER_PATH="${PW_VK_LAYER_PATH}" \ VK_INSTANCE_LAYERS="${PW_VK_INSTANCE_LAYERS}" \ - ${PW_GAMEMODERUN_SLR} \ ${PW_MANGOHUD_SLR} \ "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]} &>>"${PW_LOG_TO_FILE}" cat "${PW_LOG_TO_FILE}" @@ -743,6 +753,8 @@ cd "$(dirname "`readlink -f "$0"`")" && export PORT_SCRIPTS_PATH="$(pwd)" cd "${PORT_SCRIPTS_PATH}/../../" && export PORT_WINE_PATH="$(pwd)" export PORT_WINE_TMP_PATH="${PORT_WINE_PATH}/data/tmp" +rm -f $PORT_WINE_TMP_PATH/*{exe,msi,tar}* + echo "" > "${PORT_WINE_TMP_PATH}/tmp_yad_form" if [[ -d "${PORT_WINE_PATH}/data/dist" ]] ; then diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 9cbd1fa4..d8d16d71 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -362,7 +362,8 @@ pw_prefix_manager () { if [[ ! -z ${SET_FROM_PFX_MANAGER} ]] ; then export PW_ADD_TO_ARGS_IN_RUNTIME="--xterm" pw_init_runtime - ${pw_runtime} env PATH="${PATH}" LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" "${PORT_WINE_TMP_PATH}/winetricks" -q -r -f ${SET_FROM_PFX_MANAGER} + ${pw_runtime} env PATH="${PATH}" LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \ + "${PORT_WINE_TMP_PATH}/winetricks" -q -r -f ${PW_DLL_NEED_INSTALL} &>>"${PORT_WINE_TMP_PATH}/update_pfx_log" gui_prefix_manager else print_info "Nothing to do. Restarting PortProton..." diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 80c9b923..1c41a584 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2246 +#SCRIPTS_NEXT_VERSION=2247 ######################################################################## export PW_MANGOHUD="0" export DEFAULT_MANGOHUD_CONFIG="cpu_stats,cpu_temp,cpu_mhz,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,vram,ram,frame_timing=1,time,arch,wine,toggle_hud=Shift_R+F12,resolution,vkbasalt,gamemode" diff --git a/data_from_portwine/scripts/zen_yad_gui b/data_from_portwine/scripts/zen_yad_gui index caf372a8..8170d92f 100755 --- a/data_from_portwine/scripts/zen_yad_gui +++ b/data_from_portwine/scripts/zen_yad_gui @@ -476,7 +476,7 @@ gui_vkBasalt () { if [[ "$read_list_fx" == "TRUE" ]] ; then export GUI_FX_RESULT+="${LIST_FX[$INT_COUNT_FX]}:" fi - export INT_COUNT_FX=$(( ${INT_COUNT_FX} + 1 )) + ((INT_COUNT_FX++)) done GUI_FX_RESULT="${GUI_FX_RESULT}cas" export PW_VKBASALT_EFFECTS="${GUI_FX_RESULT}" @@ -571,15 +571,15 @@ gui_MangoHud () { FPS_LIMIT=$(cat "${PORT_WINE_TMP_PATH}/tmp_yad_mh_fps_limit" | awk '{print $1}') MONITOR_HEIGHT="$(echo $PW_SCREEN_RESOLUTION | awk -F'x' '{print $2}')" - MH_FONT_SIZE="font_size=(( $MONITOR_HEIGHT / 45 ))" + MH_FONT_SIZE="font_size=$(( MONITOR_HEIGHT / 45 ))" - export INT_COUNT_FX=0 + export INT_COUNT_MH=0 for read_list_mh in ${YAD_MH_SET} ; do if [[ "$read_list_mh" == "TRUE" ]] - then export GUI_MH_RESULT+="${LIST_MH[$INT_COUNT_FX]}," + then export GUI_MH_RESULT+="${LIST_MH[$INT_COUNT_MH]}," fi - ((INT_COUNT_FX++)) + ((INT_COUNT_MH++)) done if [[ -n "$MH_FONT_SIZE" ]]