diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index c283df1..41c4e43 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 2223### Date: 23.09.2023 / Download update size: 8 megabytes +* updated DOTNET prefix +* blocked use USE_US_LAYOUT under Wayland + ###Scripts version 2222### Date: 22.09.2023 / Download update size: 8 megabytes * HOTFIX: update prefix * WGC and LGC are set in separate prefixes diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 09db6e0..b47f685 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,10 @@ ----------------------------------------- История изменений: +###Scripts version 2223### Дата: 23.09.2023 / Размер скачиваемого обновления: 8 мегабайт +* обновлен префикс DOTNET +* временно заблокировано использование USE_US_LAYOUT под Wayland + ###Scripts version 2222### Дата: 22.09.2023 / Размер скачиваемого обновления: 8 мегабайт * HOTFIX: обновление префикса, на некоторых ОС * WGC и LGC устанавливаются в отдельные префиксы diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index e30a0e8..b39baee 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -134,7 +134,7 @@ if [[ "${update_loc}" == "RUS" ]] ; then export PW_MANGOHUD_x32_INFO='Включить MANGOHUD для 32 битных приложений и игр' export PW_USE_EAC_AND_BE_INFO='Включить Easy Anti-Cheat and BattlEye Anti-Cheat (требуется если игра использует какой-то из этих античитов)' export PW_REDUCE_PULSE_LATENCY_INFO='Уменьшить задержку pulseaudio для исправления прерывистого звука' - export PW_USE_US_LAYOUT_INFO='Принудительное использование английской раскладки (полезно для игр в которых управление верно работает исключительно на английской раскладке)' + export PW_USE_US_LAYOUT_INFO='Работает только под x11. Принудительное использование английской раскладки (полезно для игр в которых управление верно работает исключительно на английской раскладке)' export PW_3DFX_INFO='Имитация старого графического ускорителя 3dfx (добавляет горизонтальные полосы)' export PW_AdaptiveSharpen_INFO='Увеличение резкости, можно использовать совместно с CAS' @@ -386,7 +386,7 @@ elif [[ "${update_loc}" == "ENG" ]] ; then export PW_MANGOHUD_x32_INFO='Enable MANGOHUD for 32 bit applications and games' export PW_USE_EAC_AND_BE_INFO='Enable Easy Anti-Cheat and BattlEye Anti-Cheat runtimes (required if game used this anti-cheats)' export PW_REDUCE_PULSE_LATENCY_INFO='Reduce pulseaudio latency to fix intermittent sound' - export PW_USE_US_LAYOUT_INFO='Forced use of the us layout (useful for games in which the control works correctly only on the us layout)' + export PW_USE_US_LAYOUT_INFO='Works only x11. Forced use of the us layout (useful for games in which the control works correctly only on the us layout)' export PW_3DFX_INFO='Simulation of an old 3dfx graphics accelerator (adds horizontal stripes)' export PW_AdaptiveSharpen_INFO='Sharpness increase, can be used with CAS' diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ROBLOX b/data_from_portwine/scripts/pw_autoinstall/PW_ROBLOX index 9f1c434..4feb301 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_ROBLOX +++ b/data_from_portwine/scripts/pw_autoinstall/PW_ROBLOX @@ -7,14 +7,13 @@ export PW_AUTOINSTALL_EXE="${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/dri export WINEDLLOVERRIDES="mscoree,mshtml=" # export DISABLE_CP_DEFPFX=1 export PW_MUST_HAVE_DLL="" -# export PW_WINE_USE="WINE-8.8-STAGING-TKG-AMD64" -# gui_proton_downloader silent "WINE-8.8-STAGING-TKG-AMD64" + start_portwine if try_download "setup.rbxcdn.com/RobloxPlayerLauncher.exe" "${PW_AUTOINSTALL_EXE}" then pw_run "${PW_AUTOINSTALL_EXE}" - portwine_exe=`find "$WINEPREFIX/drive_c/" -type f -name "RobloxPlayerBeta.exe"` + portwine_exe="$(find "$WINEPREFIX/drive_c/" -type f -name "RobloxPlayerBeta.exe")" try_remove_file "${portwine_exe}.ppdb" pw_stop_progress_bar # export PORTWINE_CREATE_SHORTCUT_NAME="RobloxPlayerBeta" diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 3df26d7..6bc0d47 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -251,7 +251,7 @@ start_portwine () { fi DOTPFX_URL="github.com/Castro-Fidel/PortWINE/releases/download/dotpfx${DOTPFX_VER}/dotpfx${DOTPFX_VER}.tar.xz" - if [[ "${PW_PREFIX_NAME}" == "DOTNET" && ! -f "${WINEPREFIX}"/.dotnet48 ]] ; then + if [[ "${PW_PREFIX_NAME}" == "DOTNET" ]] && [[ ! -f "${WINEPREFIX}"/.dotnet${DOTPFX_VER} ]] ; then print_info "Download and install DOTNET pfx..." if try_download "${DOTPFX_URL}" "${PORT_WINE_PATH}/data/tmp/dotpfx.tar.xz" ; then unpack_tar_xz "${PORT_WINE_PATH}/data/tmp/dotpfx.tar.xz" "${PORT_WINE_PATH}/data/prefixes/" @@ -323,8 +323,10 @@ start_portwine () { unset PULSE_LATENCY_MSEC fi - if [[ "${PW_USE_US_LAYOUT}" == "1" ]] ; then - setxkbmap -model pc101 us -print | xkbcomp - $DISPLAY + if [[ "${PW_USE_US_LAYOUT}" == "1" ]] && ! grep 1 "${PORT_WINE_TMP_PATH}/check_wayland" &>/dev/null ; then + setxkbmap -model pc101 us -print | xkbcomp - $DISPLAY &>/dev/null + else + export PW_USE_US_LAYOUT="0" fi if [[ "${PW_USE_D3D_EXTRAS}" == 1 ]] ; then diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 263eb3c..c4288bf 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -595,7 +595,7 @@ else button_click () { [[ ! -z "$1" ]] && echo "$1" > "${PORT_WINE_TMP_PATH}/tmp_yad_form" if [[ ! -z $(pidof -s yad) ]] || [[ ! -z $(pidof -s yad_v12_3) ]] ; then - kill -s SIGUSR1 $(pgrep -a yad | grep "\--key=${KEY} \-\-notebook" | awk '{print $1}') > /dev/null 2>&1 + kill -s SIGUSR1 $(pgrep -a yad | grep "\--key=${KEY} \--notebook" | awk '{print $1}') > /dev/null 2>&1 fi } export -f button_click @@ -603,7 +603,7 @@ else run_desktop_b_click () { [[ ! -z "$1" ]] && echo "$1" > "${PORT_WINE_TMP_PATH}/tmp_yad_form" if [[ ! -z $(pidof -s yad) ]] || [[ ! -z $(pidof -s yad_v12_3) ]] ; then - kill -s SIGUSR1 $(pgrep -a yad | grep "\--key=${KEY} \-\-notebook" | awk '{print $1}') > /dev/null 2>&1 + kill -s SIGUSR1 $(pgrep -a yad | grep "\--key=${KEY} \--notebook" | awk '{print $1}') > /dev/null 2>&1 fi PW_EXEC_FROM_DESKTOP="$(cat "${PORT_WINE_PATH}/${PW_YAD_SET//¬/" "}" | grep Exec | head -n 1 | awk -F"=env " '{print $2}')" @@ -773,12 +773,12 @@ else --field=" Path of Exile"!"$PW_GUI_ICON_PATH/poe.png"!"":"FBTN" '@bash -c "button_click PW_POE"' \ --field=" Guild Wars 2"!"$PW_GUI_ICON_PATH/gw2.png"!"":"FBTN" '@bash -c "button_click PW_GUILD_WARS_2"' \ --field=" Genshin Impact"!"$PW_GUI_ICON_PATH/genshinimpact.png"!"":"FBTN" '@bash -c "button_click PW_GENSHIN_IMPACT"' \ - --field=" Battle Of Space Raiders"!"$PW_GUI_ICON_PATH/bsr.png"!"":"FBTN" '@bash -c "button_click PW_BSR"' & - + --field=" Battle Of Space Raiders"!"$PW_GUI_ICON_PATH/bsr.png"!"":"FBTN" '@bash -c "button_click PW_BSR"' 2>/dev/null & + # --field=" Electronic Arts App"!"$PW_GUI_ICON_PATH/eaapp.png"!"":"FBTN" '@bash -c "button_click PW_EAAPP"' # --field=" Secret World Legends (ENG)"!"$PW_GUI_ICON_PATH/swl.png"!"":"FBTN" '@bash -c "button_click PW_SWL"' - # --field=" ROBLOX"!"$PW_GUI_ICON_PATH/roblox.png"!"":"FBTN" '@bash -c "button_click PW_ROBLOX"' 2>/dev/null # --field=" Bethesda.net Launcher"!"$PW_GUI_ICON_PATH/bethesda.png"!"":"FBTN" '@bash -c "button_click PW_BETHESDA"' + # --field=" ROBLOX"!"$PW_GUI_ICON_PATH/roblox.png"!"":"FBTN" '@bash -c "button_click PW_ROBLOX"' if [[ `command -v wmctrl` ]] &>/dev/null ; then sleep 2 diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index befb336..3d96b84 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=2222 +#SCRIPTS_NEXT_VERSION=2223 ######################################################################## export PW_MANGOHUD=0 export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt @@ -53,7 +53,7 @@ export DXVK_GIT_VER="2.3-5" export VKD3D_STABLE_VER="1.1-2602" export VKD3D_GIT_VER="1.1-3622" ###PREFIX_VERSION### -export DOTPFX_VER="48v1" +export DOTPFX_VER="48v2" export DEFPFX_VER="v1" export PROGPFX_VER="v1" export PW_MUST_WINEDLLOVERRIDES="steam_api,steam_api64,steamclient,steamclient64=n;dotnetfx35.exe,dotnetfx35setup.exe=b,winemenubuilder.exe="