From 54f3bb08af8750444f481155178d71c25614eeea Mon Sep 17 00:00:00 2001 From: Htylol Date: Thu, 10 Oct 2024 14:42:41 +0500 Subject: [PATCH] updates for tray --- data_from_portwine/scripts/functions_helper | 40 +++++++------------- data_from_portwine/scripts/start.sh | 4 +- data_from_portwine/themes/tray/tray_gui_pp | Bin 155248 -> 155248 bytes 3 files changed, 15 insertions(+), 29 deletions(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 35bdc77..10f8181 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -785,7 +785,7 @@ search_desktop_file () { count=0 for desktop_file in "$PORT_WINE_PATH"/* ; do desktop_file_new="${desktop_file//"$PORT_WINE_PATH/"/}" - if [[ $desktop_file_new =~ .desktop ]] ; then + if [[ $desktop_file_new =~ .desktop$ ]] ; then if [[ ! $desktop_file_new =~ (PortProton|readme) ]] ; then while IFS= read -r line ; do if [[ $line =~ ^Exec= ]] ; then @@ -1414,7 +1414,7 @@ pw_exit_tray () { export -f pw_exit_tray stop_portwine () { - [[ "$int_xneur" == "1" ]] && xneur & + [[ "$int_xneur" == "1" ]] && xneur & if [[ "$PW_USE_US_LAYOUT" == "1" ]] \ && ! check_wayland_session \ @@ -1448,20 +1448,15 @@ stop_portwine () { pw_stop_progress_bar try_remove_file "${PORT_SCRIPTS_PATH}/0" try_remove_file "${PORT_SCRIPTS_PATH}/1" - kill_portwine && + kill_portwine try_remove_dir "${PW_WINELIB}/var" find "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/" -maxdepth 1 -type f -name "*.tmp" -delete pw_exit_tray pw_auto_create_shortcut add_in_stop_portwine - # То что новый трей ругается на debug_timer и search_desktop_file, так и должно быть. debug_timer --end -s "PW_TIME_IN_GAME" - - # В году 31536000 секунд. - # Bash у меня ещё работает с таким числом 999999999999999999999999999999999999999999999999 PW_TIME_IN_GAME=$(( PW_TIME_IN_GAME / 1000 )) # в секундах - search_desktop_file case "$1" in @@ -2733,7 +2728,7 @@ start_portwine () { if check_gamescope_session ; then export PW_GAMEMODERUN_SLR="" elif [[ "$PW_USE_GAMEMODE" = "1" ]] \ - && [[ -n "$DBUS_SESSION_BUS_ADDRESS" ]] + && [[ -n "$DBUS_SESSION_BUS_ADDRESS" ]] then if command -v gamemoded &>/dev/null ; then export GAMEMODERUN=1 @@ -3154,7 +3149,7 @@ start_portwine () { if [[ -n "$CP_DXVK_FILES" ]] ; then print_info "Try create symlink DXVK files..." for wine_dxvk_dll in $CP_DXVK_FILES ; do - if [[ -f "${PATH_TO_DXVK_FILES}/x64/${wine_dxvk_dll}.dll" ]] ; then + if [[ -f "${PATH_TO_DXVK_FILES}/x64/${wine_dxvk_dll}.dll" ]] ; then try_force_link_file "${PATH_TO_DXVK_FILES}/x32/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_dxvk_dll}.dll" try_force_link_file "${PATH_TO_DXVK_FILES}/x64/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_dxvk_dll}.dll" var_winedlloverride_update "${wine_dxvk_dll}=n" @@ -4837,7 +4832,7 @@ gui_mangohud () { export PW_MANGOHUD FPS_LIMIT edit_db_from_gui MANGOHUD_CONFIG PW_MANGOHUD FPS_LIMIT - if [[ "${YAD_MANGOHUD_STATUS}" == "184" ]] ; then + if [[ "${YAD_MANGOHUD_STATUS}" == "184" ]] ; then PW_MANGOHUD="1" pw_init_runtime pw_mangohud_check @@ -5517,8 +5512,8 @@ portwine_create_shortcut () { elif [[ "$PW_YAD_OUT" == "2" ]] ; then print_info "Restarting PP..." [[ -n $KEY_MENU ]] && unset portwine_exe - [[ "${PW_GUI_START}" == "NOTEBOOK" ]] && unset PW_YAD_FORM_TAB - restart_pp + [[ "$PW_GUI_START" == "NOTEBOOK" ]] && unset PW_YAD_FORM_TAB + [[ -z $LINKS ]] && restart_pp fi } @@ -5535,19 +5530,12 @@ pw_auto_create_shortcut () { unset LINKS for link_file in "${PORT_WINE_PATH}"/data/prefixes/*/drive_c/users/*/Desktop/*.lnk do - if ! echo "$link_file" | grep "\*.lnk" &>/dev/null ; then - link_file=$(readlink -f "${link_file}") - LINKS+=("${link_file// /@_@}") - else - continue - fi + link_file=$(readlink -f "${link_file}") + LINKS+=(${link_file// /@_@}) done + [[ -z "${LINKS[0]}" ]] && return 0 - SORTED_LINKS=() - while IFS= read -r line ; do - SORTED_LINKS+=("$line") - done < <(echo ${LINKS[@]} | tr ' ' '\n' | sort -u) - IFS="$orig_IFS" + read -r -a SORTED_LINKS < <(echo ${LINKS[@]} | tr ' ' '\n' | sort -u | tr '\n' ' ') for link_file in "${SORTED_LINKS[@]//@_@/ }" ; do if command -v exiftool &>/dev/null ; then @@ -5587,10 +5575,8 @@ pw_auto_create_shortcut () { link_cmd=$(sed -n 's/^Command Line Arguments\s*:\s*//p' "${PW_TMPFS_PATH}/exiftool.tmp") fi - try_remove_file "$link_file" - if ! exe_path="$(realpath "${link_path}" 2>/dev/null)" ; then - print_warning "Removed broken link for: $link_name" + print_warning "Link broken for: $link_name" else print_info "Created link for: $link_name" PORTPROTON_NAME="$link_name" diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index e4869c2..7e5bef1 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -326,7 +326,7 @@ export SKIP_CHECK_UPDATES="1" [[ "$MISSING_DESKTOP_FILE" == "1" ]] && portwine_missing_shortcut -if [[ $(basename "${portwine_exe}") =~ .ppack$ ]] ; then +if [[ $(basename "${portwine_exe}") =~ .[Pp][Pp][Aa][Cc][Kk]$ ]] ; then unset PW_SANDBOX_HOME_PATH pw_init_runtime if check_flatpak @@ -618,7 +618,7 @@ else AMOUNT_GENERATE_BUTTONS="0" for desktop_file in "$PORT_WINE_PATH"/* ; do desktop_file_new="${desktop_file//"$PORT_WINE_PATH/"/}" - if [[ $desktop_file_new =~ .desktop ]] ; then + if [[ $desktop_file_new =~ .desktop$ ]] ; then if [[ ! $desktop_file_new =~ (PortProton|readme) ]] ; then while IFS= read -r line ; do if [[ $line =~ ^Exec= ]] ; then diff --git a/data_from_portwine/themes/tray/tray_gui_pp b/data_from_portwine/themes/tray/tray_gui_pp index 42bfd923d3a9dce032a4b85dac50f919d444128a..4a1525fe73eeaa5f7dbdde6e31fca2102c095dc2 100755 GIT binary patch delta 7860 zcmZA63s_ZE+Q9L>j&Q<83=K^#3SLq)FPLa#sGz7=YRHg7LA}usi~2PgA*1yWSZt@jygCG^;n;EzW>WPR!=-n{oZvwd#%0J+WQxv#B#`%KHazNcXJ34i-$ z4cBUDHWr*Z(e=?aWPE6+(e>BwIh`?U1}-2YX3dbrT53I_21Df=dW{BAezQ_(c={G0}V9a&$nrOtQXfSX?#n{C8C-`hVw zZ1O4}wwbP;=B3If9x%&1O?~B|R_38L=4+|xXttXnlGVw)W=_lPPR8FrSos=~<<+Vw#&d8iPZASXk;O^G%i?UK)o|Q3u?r%zFJEmq%nw*xBIelvS z?CHNLs2m?^GEHvmTBq}FE6d7X?{o%xTh?Z*CcV7C>8yCjvbJL#p2Q}+hQ2CJO-3Homu!i7GfP9z$;kq zpKDon2=0>6tc`lkf)S;9V@no|~P{Dx8iD_%-hCWLf@OoX*o2jje(# zD-XwFF{a}aZ#td%I2+4xBi7~;)Dtw~f6*t{vevxC2=D~P<9{#<`)*|f7=smf1?w?j z8w0?R*r7AG0>iNs6L9c$F1)K{#bXtwVgoub_a4Dsg1~N;^({uA$J>k?J7Es?#$p_d zRrqIYz?=cBI%4m-xu^1O%6>h)=e6P%z>%2#Bgp9!Mbc7N3&<;Al z(U^m&=n=vq!fsfE(O8aC@Dzr#cpESQZ(=t7h#SyrC-)qK@h&D}U~9{oyEB&$Bq$*x z3F|Qjo3I#zcX7qI7_Z{j*os}?zuW2Tjd>W4rI>}Mun@n;Fm^}6JM@bMScVl?jX&ab z?3TO7>GW!2S&ITwPBxRmX+a4(AwH{oe~A8+E&_t*^& zbAcF+Cou^h+{ZS=aNLZ!aRf&Q((w|`M~nSgh{3oABk>ZJVMGND+i_ud1gGI8oQqa_ z%UX-USb>pf+s`dRUtEe~a4XKoz}4tc$%ru+ zPh%!FVh;LnE^Nn8tixEmjSloW!1lu~7|(eTidlZSOdUZX8D&_3KVltveZYx_iD(5{ z)@lsKV;G5bn2Z;35#GhkIPoAO!Y&D7;j(|b~w!T!$i!zN3fJ2 zu#08w#|XTQN%#ZiV2=;!0F$u_XJG?w#CuqVft(`;F#?Zc5?;U@ypF|egkE3r- z9!eO7H!&XVA93%|_oH0yJ;BptRNxe>!-d#{8_>5GCl!X_X^h8fn1xMPh^>#)9s@Dq zF>cvO)&zFLOPGjOZ&p19<7$jVE4P|6TpQwD495;Mh{ter;ASksBUpuLG`xx{u+=AQ zOMD!w@ddn&Md;Os^8iDz8e{OmQ?$ouT!Fdo6Opn{B2tizA732kTSAe6;| zVK@lmF$uFU4+}9LEAYQqk3RokCUFM__GfKi1pc9xMT!2HgWa*XKl}fif3j%EXu_+w z_A{pLao&V51b1T$9>6sG99Q5~EW;+O#_n}YJ%*vz09H4KU=GIMHcZ10aRt_3SuTP7 z935akypBWBD~v^nA=s*(lMMaQf!SDyMOc9^ooD2@1n=T8>@d)>zQb?~xxk{tL70sz zu^0t&s|acd8ZiG$4w^xhwF^V=AjaT%Ov5Hzfe{zEa!kZ(?D7={501uGPw?)Dz3~Ga zi#IVHf5g=|?hq0Q1pzFpCkx@Dj#j^i`$~GjM~J;{iN~ z^;nB{@gjD3iiguTOg;9+1ax3F)?qRJgjHIedyT0lh{1c9gnnZr3?s1ylX3oaZXFh48D7HEnENBaO@ayEa_@#x5qsk%9E-a! z9dF}m^tr*~7w2OwzK4zY5&8_Xtg{%3KVvNV{F_^coiQKBV>#}^+F{n?))xegWHjAm z>LWSpZ!z__8sqT}W~0w-rXC&g+)(qFsg=b;O+OPWdxx4Here0tGS;tufrLr?w@U5| zH9;mv+6;qq>8~Wp1SLl13^TpjFNwc1NMB_>JcMVcPwbtwVcnPRy;!L*kK zZFH?zu0@*ern{_5G69|&Y-}JI7e#o0u&;(e=9FZB?bH%kJIe%kwBXfJ-ff|j@P z;OQV+hSRyP994Ye@^B_0Ry;?*YU!yQmT@B(STC6ew(F%*I)cydC5J}PB0;`Xmdj5{ zg>;ODDKaFQs;5d_bG0a%xjNaLXfMUl%+)d3Mg`MFYNGjo;c`bwm3AXdS6kj2(mKWX z+mGAXoNvhC=ZUWpuX4qn9uM&PB3oiifV~^xTz8dd;&gYFDa6y{hml;0rz{>t&E0g+ zv`hw%;x2?r$|y?0v?PdY*fNSs$!o6XnM6y6e5*ON(q=T}ho%2$QiZZEl{MfP&DF1$ z*R*7zYy{g(*C_4LE&0$=IXs@b-l)~m<%iLXr>InRI*h+(8RaWvNDM7Y7LCj;vDx>6%xPVjw^^A?rEzdZY^`hGG9%EKP{2g&v42qYEH0zdROym^A$_zIHqEn)(wzY zjpJpn#tx0AYKs8L*LX?uMccbQq(3A`-&u?>ns|!5_$JE!sr~Dw%lviIdHL|&Qc7sa{XL{qxOROS1?8>}SwVP0IzCI` zX;)!2In`PiWWLl^0e1b0c%?*2pJf`GO62gfrn~JT%Zu$$6w5H`b;1KAm{|9g=1Zg| zj<^%an&_LS$B@4)(!{7dX&pymGYK=_)&7VUgyu{o3n@D_z~%n~0CPda~;m(Mx&F6K4-2zTj%>nLs>2ZcSjEGsHU%UY0&! zTfamr2Y67vS~B9euiSSn50JgeqjFY>mOIK&Y4b<6R@-9TZXCvcrj zI5p-?q#tqjQ?3=>b@x-NiJk6#8a1)i-PGq#B-XnVp(M;A8Tcpq+2ZcUp%p%G_mi)Q z3U@!{n%LuRTC0g-ccPJmStZ|TKfB!hgeFkoBX>Wsnuy*gXLL#&BsjxMo@e6n-385? zpj-=v%Kii{U9*S;bfGC{@ztMV`;un`CXWK508~__(%`{VFl#J3Q+Y?rua(G|6n(Ol$Zf61ZyguJJC%}4JWNt4p~iSLb&`?Fb+*+P2Ys{JtEpvj zPV1JI%33|Ed?vG^-!65n=ui@@kAah^o+r;uW^(-`Y6@>1!PAU~rx(APdP&J-dRZt( zwUR?FD@kIeK#X)&Mrjj$yGc>H$zo-YY;mQIDsAPm(p$__7$}{UeiEg0loVxKDg2z|>WQz!OF8l4T06Iv7}-+*muS@XkQf@d)2*=5aRkVq1|HH@4=+t#MQ2kw^tC?l*vmm zOj8~4MVT>^adeP1Gr6E3c?WF%J7m=iDkSvgbzN?`O1x)Lp{Mi#+fzH52jf{!g-Dr@ z&f2|87$;6p^0(s&hkmHreDvbWrVhLZ3C&* z{9bY{lcBxp%J-Sg+xArPo6X|9vD5X^aXOUmK076Kw&`M8Nz`n8ch^<6c{a`MvTZiq z4v`beDEY?44hL5p?4ZIE@~DH7L>Z|h$y5iQ_NJ`V)Ip&hPpDn4$4C6*{3H;Zv3#u0WzH(|w%-@OD-Py8REz7S|6eIS|GVPlys&BU1-YZe|N33=&33Nh zhRVIGO}`fUz2$FQbw=0B|ab?eL*rnYj%deftt*;$up>(}y^e`c0X5^Ybkygylsq~!}F RtLM5ttGaT`3$`9D{vQgeF>C+; delta 7834 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 X$;y`CM@d!}`aY|=e!`=++q(T5Ej2Z;