From a672741c69dad184fa1b1c02fcd48370a4495ef7 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Tue, 23 Jan 2024 20:44:12 +0300 Subject: [PATCH] Scripts version 2247 --- data_from_portwine/changelog_eng | 4 ++++ data_from_portwine/changelog_rus | 5 ++++ data_from_portwine/img/gui/bsr.png | Bin 987 -> 4568 bytes data_from_portwine/scripts/functions_helper | 4 +++- data_from_portwine/scripts/lang | 2 +- data_from_portwine/scripts/runlib | 24 +++++++++++++++----- data_from_portwine/scripts/start.sh | 3 ++- data_from_portwine/scripts/var | 2 +- data_from_portwine/scripts/zen_yad_gui | 10 ++++---- 9 files changed, 39 insertions(+), 15 deletions(-) diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 4dcf03a..d4c8647 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 75901f8..b692f58 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 dd1c2592d7fcd457f7be7d8144d714a26b82d9e6..2ecfc0d20dda1cd4d6a22c636d14fe95880b98cc 100644 GIT binary patch literal 4568 zcmV;}5hw16P)pWa7jc#RA>dgS_gDiRl412e|jegNq{6k=pr2{N-t6z1kr$$1uiQH zjs+hxqvB$8K*~G;eKJc?DFTk5IKZMeiPC%TEfA8Bkc8Af$$fhtax;M>I4pF|TKB*A zo_o%BzPi8foW#Y`(-Q>+1@QItb;-%evA`A<78a73nc0(%y)Dan#OZW;@Y#IRce}Z` zxPag7*Wdi^?(S~6y1MQs;Wb`fUhA^5vaV;4-c`$=HuhzqWh{fk*9PD^ij2H)%-{YRJ^P1E|kWF(x7_v z>VB!Isf&w?i~H&WTk-81T%~Cekf2C-`e__Jb`%bWCulM3-m?e4vn5JO`Eb*neC#D3 z18?2Bb%{c_fKs`3?%dgx_m%uEtvY#WQU&b?1qNCphYv67f23_&E52@>|CS}hQ=#~x z5Ql<;g9E8JV+GJ{UM*$V46vE!K*L<`UcIbmhYmH*u`w~$z$XWYh=l zTn&Er^Yu0Fq*W%IgcJ?+m8biF&xTLZETAjZr7t`Bml8D0+lxK+=%dzKZ@y{KRAzBm z;o^l0)}nhN~nay4J?L- zhoi8t0P`0tK=WqJ5FQ?en3!6~%F0B)e*N%B`*s*NemshtPJH#%mmtjIW@e_4L2!&F zO`4D-(5X`=BqSstDk{pn3vzXplt_uU8-=kS@8>SmBq^&cXyWyH;Z{p>E8#`}xtFD($y>&t9}>-pnv` z{P=NrdwL-!w6orc}WGv8uCje zsfg+kV8S5dkr@BlYsSZ;qoZ)-$Pt`AeFppX?MHjY!@`A&jHWZQv#@vXez+9mW7*dh>MF;5d{`is8OQ^Hf`F3 ztn6FZxM2eh96V?=SVW(n^^dvuZo@`o+*!Ehsh? zQKYqD`_DwFNQ5!oSVV%skDWVrA|)loxKtIfA%TnqKP zo<7rS`zq8U$ALNC4xUVlkU#H?AfC}6gMS{73%CY`3f-pDDj z@Klg50=jg^_8S>UT)!SIJ9ojfsZ)_KWC-%}^9@L3WMmj6$(_r?ZYgu}7AZfmN(*S9 z1W;4CEuTMq`ZRV>J3npv3H_fMg!V+EW5S`oVF-NWHPIvH#i=!YS%j>n)u0}&S+hZ;3&5nFS{yGlMSmi?bO1q}STt2M-1KW5$|w2q##K8aWaxSFQx} zi9x`$w6ros{>K8?u2Y{HefQmWjV~(8h6Dv6>FQN<_Hy94x^ejW+$Bu;;IEkc!3X$e z(IR7N#Y)$%UD2XN3)G}gthEe^#l*xQm@q2W$Y=SU$6RnACl8m4N^m|mACCtI;K$Qv z5lajF@WT(r0ynajB{U2(Kl~8Qnm5OpGiSgG0Fx$7GWkIXu(XxMK&1lMqwITg5_|r+=kUtd zvFJ+I85b3f0mskLy#|x{zSy#5i&;#$L&&8(QB@Nl#K+fV25yc=AAJ-T&z-~MDN`}p z*MYhr!I*IFGP<#bdUnJJD1j|vJw z{PWL2%*XZARLonr5Xr$Ih$Rp*;UMj1reR*|b?@HYSg)M>sJpCH8pK*iW|!}^BQo^s z+ZVGLRDO9mXloTAaLjAC#-LuYd^wgZU5fF9PSrWzfB!us2n#lYTw2twbILOyCE4(} zYxizs-AF^i+y8?jYgWTyF~BchK{v*cc(}dYjbzr}TRxb}VxU6dA?CH{lqplNfj+8$ zn#<%=%;5W5bQqFq)kd0|JN~(F0gfI&0e||vv_50T3^1dXX+{rXQuGuD$1{D zCdCK_e67BJK*GP4;bvYwJOcvZL)g8>dTR9OQ7l&$7-8;MKx^FHA>u+D6=2#Ij2|}+ z-5>9RZiG80^FdhO{@Af`BPP5((J;S&6>7(h9S!p;#Ke&9avL$Oz!UR&w>7W3-qrM7 z?<D^zINqg!ECqC(Ul(zTF73gwe;g=CQqIW9^06JpEz-%fn@=J*0iro zT3sb~P<}2twQU1mx{)8(3}G(eCh6A&ur(wm&Jo_$ty_nX;9xm3{JBsLh0~T%HNC#? zW&mpO*w|PM9y}NlL=4zX=yl=31zccYuVxNW)BZsTPVr?6pnfS%t|T{&BGW4`Ucw=6 znhxyR$+Et>$^P~@-R*Wq4A`bosqn@dZy0}ma=-w%F(xkM7r>7-eKB33m;#6@A#E$@0W14WF3Qz@w! z{Nw<<|Ni?1%4NOE+8r*W0n&nedCr_U=+dPNZc-Q@Zdf+u7T|4fPaM8-8BQ`S|JO;K zl9#L?ftB!-aE=~5Y64scro<&s5Z$-ldJBgR9YS()vKgm&HuK&blgc`(NoEEPv4qd3 z6>4%TtBSUMg9e!Y_19*tyM?Hb2W%@OvLx2NSH)Q;qRgD{S0JLK7}1RyBQLZXj!>&E zWJ($pBht3wW;t^M&yh@Ckh`gp)viu8ji7nbq)BFuTu}3LY0V~#mCkM3B5mzz%udZf z$KHLg^2Ze>@onC`89R6FDjQ27?wtojP!;He2@{OJ2GHj_5fQ#xyB4n=+>a)MhhX!{ ze<3t1+$coa6=bT;8Ow5mhhQcN)~;RK^b0*y*EFCe1-b9M^NwL!lO?#U(6W7dxL&!0 zwP{&!qmqUXehTZDA5;u#4_;NfBL*}`8c~xLm4&raDyF=?M4nXcux_&c590UOI(3b! zh9(JpH(k!aS8=?FT18c#-s;c*{N>}M6)Zscfeq^4y{Y0*wv$_qMD zk>6h+0;$Ev#~YZHQs&K@XX<^;(WQ7BF={kQvNO>raSNJ7M!q zT0ny8Ds5#hBz0H1rL=uh69$C`q*SS^&;*rG~=E%-?E9p@oM#j&b90mWix)Pyh}P=4QBgnBdz1(i5i#|*Cv)r{!yPAR>nYUP>78}9Jkt!3Q0*u;& zB$>1nz=zrtB$cXJmYKs%N)b2bK4?da{5>ZZ>le*Ozh{P`_n@b+k4YzqXp_PMEQ9b{ zNCcAE&1QzXxk#RohVyDnjR*QO7Pf3gz}l5~IWimuPPM<_^K_2{wGGSb!fEpLkTNJn!nXf_D zOE_~0JF|00gGVNJ@?T~F@lk0EhKrWff=76itA_@x}=NuPmI@;lmYNYj;pO4`vof-HP-DvrZ zOsq=JEL&TA+|~YV0YceE`g&ImP(e}=XiGb9S1Y&AcETCZ^}N0CJOv7;Yt`h&BZ&dH ziRg48-^p_yZtAJ+ST9cmk--zWdGMeh{uHbc=hb8XWAt-B3cH3b@=0@q(U@tX% zmCQ6Fvts&aexb2O9D}k6<3ZX#Nq1XMgjto5NumF}R}kZh*}HsR%aw0N04jfl{w_R_ zCke~=wMq+=pJ^6Q$6brWQL9aSy-%EoA} zXjJy?9({&S^6X^o)sW+iC=*I2$d>m@(2S>xQ5Y9<>G^ItV$>eP*sk#X?(z3{H#}1N z^Ek%TF|IrV@}NI$DxIVOlJY?o`90=}C&N68y3_pYX(+8g%yl^Ag4zm(Qi#pv7?+>j zmrIqK`&$Yi9>j~GN#>99D5oCZ^|y-K*g{`2Lhx{k1*pgS9HhU>{gzBTFfD33mu~YJ zLpD^*v)aAQyv}jd^zSz2fj^Wmn*GnyIvY4ixyROmH1XfMis=zf^0157AF1Scn?Jta zW}Y4Y4@xA9l`^FK4FCWD4rN$LW=%~1DgXcg2mk;800000(o>TF0000;_2(k{+wNkOG86HFY`N4 ze!r)SV@Sl|w=)7gf&(Rv*B9@e_OMrM*=0A8G)GC*sgg^+1iV%(aD3ve@-leMfmbWH z$8~#j%u5#hBJ|@@a}$f;&a=9&7IrMr6g-pAr<$=OXV=#U+uq&1`*mLNbMFh5{I_p@ zzx)6FocA@)?-aBBuPV%05XL)u#nH%&)Ss?($qar{H;*&k`mkV;NW%La$CY-h5-Bg9 zVmxONZ@J^I{J;fP2l#5f6i#aEDm<~a_6F;U9}-KXub#Tdci^C4UP0qqrE{Mes($V8 z+?`sL61kQ6L(y!;ZJZT)lP2=}Su3ZU;J%uemGad8!>lN)IvLrLHzhm7xi~c3jIynS%kF(?Pko}CXf)N;UDzFRPmDE7pCcF zpJYoa>CWh=O!|?z=%m5P#U`^D&rKGX7BB7Ea&i-=U-3nseXWI>KfO$k3xAe1JMexL zqx?&Q$@fDOHBVlvWIJ0H$$mX@Rgm3bgRg0S@B8j}^`ifQDVMnTEU%95v+jRh@grkm zL`?n;??ZRqxLgbsFO8Y%am!$?&|J-4KM_O6>3jBQBuzE^d}WJX7i-c?g|*+Fu5~v& zn^?W5w5db?&35r=?Yrif@n4x@bHLMn^BRGaXq^-W8sEj|<`lN_h! zaCTSuA)ddxqPq`0-o$V;b$f^0q*nLKdmfbBT)0eTf?7hY)pctbm(+RrK1OaQl0IR3%>P25VPucz;_ YWnuuaqzopr0C4W2H~;_u diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 76ec408..b8fbeea 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" } @@ -1010,7 +1013,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 1487723..9bb50e1 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 eb493fa..13980aa 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -266,10 +266,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 @@ -283,6 +291,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:" @@ -674,8 +685,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}" @@ -690,7 +702,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 @@ -708,7 +719,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}" @@ -742,6 +752,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 9324998..a2aedff 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 ba5ffcc..3dd87bf 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 caf372a..8170d92 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" ]]