From 07e7ab84d9933862c3969a7e1d2f49b0f68947f3 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Thu, 18 Apr 2024 15:23:46 +0300 Subject: [PATCH] Scripts version 2281 --- data_from_portwine/changelog_eng | 5 + data_from_portwine/changelog_rus | 7 +- data_from_portwine/img/gui/close.png | Bin 783 -> 0 bytes data_from_portwine/img/gui/close.svg | 594 ++++++++++++++ data_from_portwine/img/gui/download.png | Bin 6325 -> 0 bytes data_from_portwine/img/gui/download.svg | 67 ++ data_from_portwine/img/gui/error.png | Bin 6919 -> 0 bytes data_from_portwine/img/gui/error.svg | 56 ++ data_from_portwine/img/gui/find_48.png | Bin 2017 -> 0 bytes data_from_portwine/img/gui/find_48.svg | 597 ++++++++++++++ data_from_portwine/img/gui/history.png | Bin 949 -> 0 bytes data_from_portwine/img/gui/history.svg | 596 ++++++++++++++ data_from_portwine/img/gui/info.png | Bin 5846 -> 0 bytes data_from_portwine/img/gui/info.svg | 65 ++ data_from_portwine/img/gui/question.png | Bin 6565 -> 0 bytes data_from_portwine/img/gui/question.svg | 58 ++ data_from_portwine/img/gui/wine_file.png | Bin 880 -> 0 bytes data_from_portwine/img/gui/wine_file.svg | 597 ++++++++++++++ data_from_portwine/img/gui/wine_system.png | Bin 1124 -> 0 bytes data_from_portwine/img/gui/wine_system.svg | 862 ++++++++++++++++++++ data_from_portwine/scripts/functions_helper | 64 +- data_from_portwine/scripts/lang | 29 +- data_from_portwine/scripts/start.sh | 2 +- data_from_portwine/scripts/var | 2 +- 24 files changed, 3556 insertions(+), 45 deletions(-) delete mode 100644 data_from_portwine/img/gui/close.png create mode 100644 data_from_portwine/img/gui/close.svg delete mode 100644 data_from_portwine/img/gui/download.png create mode 100644 data_from_portwine/img/gui/download.svg delete mode 100644 data_from_portwine/img/gui/error.png create mode 100644 data_from_portwine/img/gui/error.svg delete mode 100644 data_from_portwine/img/gui/find_48.png create mode 100644 data_from_portwine/img/gui/find_48.svg delete mode 100644 data_from_portwine/img/gui/history.png create mode 100644 data_from_portwine/img/gui/history.svg delete mode 100644 data_from_portwine/img/gui/info.png create mode 100644 data_from_portwine/img/gui/info.svg delete mode 100644 data_from_portwine/img/gui/question.png create mode 100644 data_from_portwine/img/gui/question.svg delete mode 100644 data_from_portwine/img/gui/wine_file.png create mode 100644 data_from_portwine/img/gui/wine_file.svg delete mode 100644 data_from_portwine/img/gui/wine_system.png create mode 100644 data_from_portwine/img/gui/wine_system.svg diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 63c99e80..c09baf2b 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,11 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2281### Date: 18.04.2024 / Download update size: 15 megabytes +* the PortProton script update window has been updated +* icons for the interface have been translated from png to svg (thanks to Dervart) +* fixed the native version of PortProton on SteamDeck (We strongly recommend switching to the flatpak version for SteamDeck!) + ###Scripts version 2280### Date: 16.04.2024 / Download update size: 15 megabytes * minor fixes for SteamDeck + flatpak diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 424a574f..0bd34fa8 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,13 +2,18 @@ ----------------------------------------- История изменений: +###Scripts version 2281### Дата: 18.04.2024 / Размер скачиваемого обновления: 15 мегабайт +* обновлено окно обновления скриптов PortProton +* иконки для интерфейса переведены из png в svg (спасибо Dervart) +* исправлена работа нативной версии PortProton на SteamDeck (Настоятельно рекомендуем перейти на flatpak версию для SteamDeck!) + ###Scripts version 2280### Дата: 16.04.2024 / Размер скачиваемого обновления: 15 мегабайт * небольшие исправления для SteamDeck + flatpak ###Scripts version 2279### Дата: 16.04.2024 / Размер скачиваемого обновления: 15 мегабайт * улучшения flatpak версии PortProton: - исправлен запуск игр на SteamDeck в игровом режиме - - исправлены локализации внутри игр на SteamDeck в игровом режиме (требуется выбор руского интерфейса PortProton) + - исправлены локализации внутри игр на SteamDeck в игровом режиме (требуется выбор русского интерфейса PortProton) - отключено скачивание контейнера steam runtime (уменьшает размер установленого PortProton) - улучшена функция определения библиотек GALLIUM_NINE * ВНИМАНИЕ: Не используйте flatpak и нативную версии PortProton на одной системе! diff --git a/data_from_portwine/img/gui/close.png b/data_from_portwine/img/gui/close.png deleted file mode 100644 index 04542779d1c1db8c37f7fb9aa81e53b2ec9f1920..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 783 zcmV+q1MvKbP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10-Q-i zK~zYIy;jYR(ohus4l>XS0TX=#AHl_R0u!Y%F_O6TA&j#bb?F-zosG;xxHe!W0lJ`M zN-~?-`wC++qb&mAxahs5x7tRPPF6R=g!JmS zI0*j$K;YOEvsH%v2tYG%Y$DIAiCOVBoZeV#u^CfKPO5PsJrTWWtYx@D(>QPrn;LRu z+%R!^Duvh!GeZpgQ)Y&G#NhH9Gq0C9uNBjo06%J zZv}uCIQDV8*A%MMPb({eHJ}claX7bLs^+I17#gC7WJsYCIQGfjRoxqCkVif%0)XiI z4izwfAwNLNkpssr#EkR+PvxGbY_X;^)VqW zO*LyGSgUGUH6~CTsze3k~Ou@r=2i>sWxOFHOw%gOsizia$ct3P?B#`k|Z_O)VqLb#VLVtNDc zuW_K$*lFh$77N=0&nf#vV$s|3K_8-6^{Z{ym8-M@+ N002ovPDHLkV1jyfR(Svb diff --git a/data_from_portwine/img/gui/close.svg b/data_from_portwine/img/gui/close.svg new file mode 100644 index 00000000..a923cc48 --- /dev/null +++ b/data_from_portwine/img/gui/close.svg @@ -0,0 +1,594 @@ + + + + diff --git a/data_from_portwine/img/gui/download.png b/data_from_portwine/img/gui/download.png deleted file mode 100644 index c55fdef54954e0462f2a1a9301af357f8efbb6f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6325 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 DUh&f? diff --git a/data_from_portwine/img/gui/download.svg b/data_from_portwine/img/gui/download.svg new file mode 100644 index 00000000..bd3428d9 --- /dev/null +++ b/data_from_portwine/img/gui/download.svg @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + diff --git a/data_from_portwine/img/gui/error.png b/data_from_portwine/img/gui/error.png deleted file mode 100644 index 3455a17f50b797f82edb6ac46431ceea82f91f56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6919 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 diff --git a/data_from_portwine/img/gui/error.svg b/data_from_portwine/img/gui/error.svg new file mode 100644 index 00000000..45b98c8a --- /dev/null +++ b/data_from_portwine/img/gui/error.svg @@ -0,0 +1,56 @@ + + + + + + + + + + + diff --git a/data_from_portwine/img/gui/find_48.png b/data_from_portwine/img/gui/find_48.png deleted file mode 100644 index f4a36ec3322cf85645ed5acd6ad77e51be81a12c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2017 zcmV<72Oju|P)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H12X0A3 zK~!jg)tPB*RM!>9f9K5`+i%7@W(lQ*ny|#!ECxJ8g~W!a4K$TfDWRqPP$@`Bg%mX( zQqoqDXw#6;MXAzNjg+WS+f-_WT9P)Dw0In1g6-IVu`!Dw6bQ1zVq@%?v1fUwAI1zb zc*gb^Pu%{cD?Qz_zq_4#uBa->U|QbBe+X=f^@x54z%*1pP?1{%m0bXaitLD2;ji%k zVBFs6@;2hH@gS;-%i9?9pnc6UO0AqIA*omK+zPLV=!e*{%8cg{cpMdw+l(JvRnEE3 zRYsYt+J>Y?5+tT)Ihki=5B~sFEbj*!M721ndvOSabKVxKw!x12a|9dbz(SAAmBqi|?PiG;BS^P^5sSD}V{$s%?67 zJk0*}Rewo2a)2WG-P;`6WhUb^#JI~=yX)rkO`rjnZtt|!?n>pB0eosSzmo|hg+l~? zjR${?hkS=4)}J&6fd1+#T;4_iZd6y1U)MCch0VuK$G+D!A0OMLKQCPv`#!X~JV7Ao zIJmrx>?r*-zh3-VN)I09aMe;oA<*C<;BjFiz8}aB1#9UJ@i*sQRa5h6AClml|$FMRnhayk*IRC z4Jj%7H6Fg*d7fW=)IEY$U6jw;%kPP;=?O*fVPKFa=FCh=+gMUGV%eI4zOKkO#%rLw zp_NBwOv7K}L4n%dKGqiGk!?hMJ?RT1@W)niVSRnk&`?g%_+v?qMS0mz9j&T(@=Rbb zvY_L*HSWD7-L|H&ZRg&ry+aw_izYNp(}4*f?;LYm=HRBWn8ynh=?T=V-VY$I+J;vZ z9-A!X@$lDpB<+PZjAl{Ur-t31lxoX#gvWsQN8d0RRipXHc955VCDPpXCe{$G4n_S?I6vh%;zUL-kNF z^yl2*jRW^wI5^d%K}GcCdKLyZh72R?y?c1H%X3OSPE=|W!D*V2p^zb7yiVN;*Ilk|}$|VnGBxU*Q44S9u?aa*xc9KcH#x_J3wH&=qe(Nt^31DJ1RQ@^T$0@FdzR=(VJii6kt3EFm2{xY|V z-4%*>{+&$0@J~nz#xkb9l_hvm(qEF4xgW8O|AT5 zxYYaa$|Y2|T`Bo98o&a}qBMHF;d`AI_&69Emt4@cd7~?OHx}TYsS2P!eCzRY?(nnh zcu^d82fqnYa&V%0WW zWbzZO1Z*fSV9(OU7y=PhcK+uQZ(ix;($Eln;Rr6n!Cl!-R_EvPvxW00Fr#moJ)tnw zEghT*1X8I!FYb5WudpLV3yhxs+$kI)ROY#PdEq>k=cT?g^@PGadHNiirWNt^SDY6-FJJ4?VRZTf;dRaJ|D?IuIpxl!(>zVB zFWjuzsH#5Rakl;cvaB-eKud)oGP`SC + + + diff --git a/data_from_portwine/img/gui/history.png b/data_from_portwine/img/gui/history.png deleted file mode 100644 index 440738c9c2eb2c79b5a12b9201b7b7c75dce274f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 949 zcmV;m14{gfP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H1142ne zK~zYIos~a`TvZgtf9K8^=Dm%?NG!!dEEE$_VaE~Ob=F;6u@MPY#>NEENRd+QFsQvOBuCO{cLE1YQsc$-E$H z{|w+AlJrEV3#TZ&tL7^|B)P%_iAWJw8D^OLtE`?^DiX|>HK;Rn&T`Aj?6 zmou8jy_?Z$7l>s95&)ef3hWT@8uhA|ce;U~BQv%DlAUTP^PO(gtDbG({4h>>DNk1H zGiT|mcVDV)mJ8+%3w!_uJkS{w0Z&h*JWbFf;GJmzM~T~o{Ne=h0mj*3W?R2oU;MdH z(F^yMi$DM^asFhu|4JdSWO&d%$1<(Sw1(*ifMjLyQW1D)aZI*lvMpo+@WbehBJl8b z$Ue^)9?Ph{_rn-7NZ}&w{p<(&VJwWPtY6UxO|*&v1up=VVxV|hFzU=!@`HgI^)7P7 zK&KB8wGlx34jUmj;O+zF@1sFm2%~R=y;BGr-;@2EeL#n;w=6AORg>EQJ>LgBaeQL0 zSvn>~o2F6O3gC8+NWJVHyz%R)X6g73rflY%H68YPQ5OwbUy1k1_iD)X#KaYx{vOD; zY_bo4Gnwm7vQvGi^5Xtiei;8aNqF3ibJSR=eq`9o$Uf^l&F$wt1$J_A_vsVTWM%PE zvQu4XiSvFKCq=D4RN?8K>QrK8lHLQJnpN;gNgp%ou1N+wGHQC#mw%okqH(y<6^h@?*_U%J z>HEOBiGnSWbobjhE9u%yVgLjAwM3F1_bq8suWd_i88`sanZ + + + diff --git a/data_from_portwine/img/gui/info.png b/data_from_portwine/img/gui/info.png deleted file mode 100644 index ccfa4ed262472e6ad5a3ecb16fb39118da11bda9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5846 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 diff --git a/data_from_portwine/img/gui/info.svg b/data_from_portwine/img/gui/info.svg new file mode 100644 index 00000000..b8d8d1f5 --- /dev/null +++ b/data_from_portwine/img/gui/info.svg @@ -0,0 +1,65 @@ + + + + + + + + + + + + diff --git a/data_from_portwine/img/gui/question.png b/data_from_portwine/img/gui/question.png deleted file mode 100644 index 019e91737ca788bb185ea27ba35b2bbd41d9abe9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6565 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 nM$hKG*#eIG_iGkyey5wD0Udb2X + + + + + + + + + + diff --git a/data_from_portwine/img/gui/wine_file.png b/data_from_portwine/img/gui/wine_file.png deleted file mode 100644 index 3aac46989b656a6b1e8f269f73d9fcd6fdd6aea0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 880 zcmV-$1CRWPP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10{uxu zK~zYIy_U~wTvZguKi@kqrSs68K`S*8H`b&sgkXY5WQ6)3sHjvIA~hQqZmJb5Sy{Vq zA!1Q?f{LvmE(EF043#mvN+_vTlo*zfMXbH3--J?Gpf z+w>wy>y3yxhIkJk0O}lm1CVXfdgEG`qFx(GTKnY$Vg>wEf_!vG0$ktWq}7czOCK`; z!O}fo@%$teR$xIgZ81b{z&;YXdL7gI|rl4frL)-v3x!G2ER17qQOt z5E{q<_(piC5RQ3Bc(E{(G4hN`{S}k-W1e0J_2&8Is*lsxC~3V>$fMw~)XeV9W=h`! zOPx=D0r%%U7OtZ;6RL=2_q=DOd9dJ)0plce5c78ySxlrCZ#8GGO+@TqUm`ze@y-zW z&;dT=m|P^Z&MRuEyQX*K_>V+z#Bic7To@&l{DM$L{=eOp8RIwBA@V z904BqpZr`Be6n3xKBcs}xn=Rl6h<=OwBe_Ku0+L~!xR<6tmTT#ipsUkNcXD7<9ACR zDzc6I0kD5J5em+#T-*H8k + + + diff --git a/data_from_portwine/img/gui/wine_system.png b/data_from_portwine/img/gui/wine_system.png deleted file mode 100644 index 61d934740dd3ad6e6388dda47ce6565764cd5514..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1124 zcmV-q1e^PbP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11Mx{j zK~zYIy_8F6TxAr;f9JasoVgi{wXK3mi(M#!7TYv4iN!KALcs@OkkF#Vh17+1S z?V?r`L=X|IHXDl++JZ#{DVp4Aq)BelV6|0>3n|w315A_LYs}1dT+AbPCNqof4RTV0VsIv0aT&gM@JLXipL{kGOCRVRIigE?mQyY-jcTlqj zASSW3s47Ws^3Hnqs#?mcsP=3njc8g+iWL>p^kz9^Jx#QN(RM5`5X%8I>_crj$n{Oc zy|cF)iWf!YU>#7N7j!xbwxZvOidT)_u^VT%^_`DZ6bgro(q)YE=}czJg($dlWNfn* zol`+Jbwkq}J3W6;;mL@~53=drCCN8xM5BSI|7sXr&;JCtqkP-|d|&b|(?Kq^xu$T- zwWI9NSJVx&y?3n$=;r;MC`W6VfKnAf|MeJ0|JC2X@~u2!t_h;(BxSt?|yTne1vMh>-m>J3gs|PR)H24M0rclzY+O)F;+#PA6Q=@407rIDo|90 z5Y1R?hQeIxi#p!-+@Xm+jP4Dx=|?I`Q}U8J4m|UZ6HGP?+34wTF7{ZBs`6tk+Y_3Y zk*TSUsDbPGKdR`UKGYr5q#x~La>&2Y8ZH6xYMP?iFw>h~5=EmqjC*4lcX;e@t66Q? z$5zrdaPbBBd}5of-j#n%NMs3Ea3im(OPx@awUP73^KzrDY$Qcn_*%rw zRz}~5*)*H!IadvSWa3sSYU$xYlakLTHItcbyNQT12zpO70JR4tpN|8`)KrHQc`ahS z(IvhU>Pp(|-Dx4e7Z3d&d<)=q_Nmnz$#!zcx~)s?e1P^MdarFTTo5|8&r8B%%zVs zvu(PE32*W~!5%LYUlx@Qz@9yHkR#&FWP83@*1^>hRwR)h&xndA=-^zoclXs0RiynrY*YSs!iFVv qhy5c6yV~# + + + diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 0671c70e..8429b857 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -1156,7 +1156,7 @@ pw_init_db () { pw_port_update () { ###SCRIPTS UPDATE### if [ ! -f "${PORT_WINE_TMP_PATH}/scripts_ver" ] ; then - echo "2022" > "${PORT_WINE_TMP_PATH}/scripts_ver" + echo "2024" > "${PORT_WINE_TMP_PATH}/scripts_ver" fi export scripts_install_ver=$(cat "${PORT_WINE_TMP_PATH}/scripts_ver" | head -n 1) print_info "Check update..." @@ -1197,10 +1197,17 @@ pw_port_update () { xcsd=$("${pw_yad_v13_0}" --title "${scripts_upd2} v.${scripts_current_ver}" --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ --form --separator='%%%' --width=1200 --height=600 \ --field=":TXT" "${CHANGLOG_NEWS}" \ - --field=" ${scripts_upd3} :CB" "${scripts_upd4}!${scripts_upd5}!${scripts_upd6}" 2>/dev/null) + --button="${scripts_upd3}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":252 \ + --button="${scripts_upd6}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":16 \ + --button="${scripts_upd5}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":18 \ + --button="${scripts_upd4}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":20 2>/dev/null) YAD_STATUS="$?" - if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then exit 0 ; fi - xcsd=`echo "${xcsd}" | awk -F'%%%' '{print $2}'` + case "${YAD_STATUS}" in + 1|252) exit 0 ;; + 16) xcsd="${scripts_upd6}" ;; + 18) xcsd="${scripts_upd5}" ;; + 20) xcsd="${scripts_upd4}" ;; + esac fi case $xcsd in "${scripts_upd4}") @@ -1894,6 +1901,7 @@ start_portwine () { export WINE_D3D_CONFIG='renderer=vulkan' else print_info "Use VKD3D-PROTON, DXVK and D8VK (DirectX 8-12 to vulkan)" + check_variables DXVK_HDR 0 if [[ "${PW_USE_WINE_DXGI}" == 1 ]] ; then export CP_DXVK_FILES="d3d11 d3d10core d3d9 dxvk_config" # openvr_api_dxvk export CP_WINE_FILES="d3d10_1 d3d10 dxgi" @@ -1903,7 +1911,7 @@ start_portwine () { export CP_DXVK_FILES="d3d11 d3d10core d3d9 dxgi dxvk_config" # openvr_api_dxvk export CP_WINE_FILES="d3d10_1 d3d10" fi - check_variables VKD3D_FEATURE_LEVEL "12_0" + check_variables VKD3D_FEATURE_LEVEL "12_1" if [[ "${PW_VULKAN_USE}" == "1" ]] ; then export PATH_TO_DXVK_FILES="${PW_VULKAN_DIR}/dxvk-${DXVK_STABLE_VER}" export PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_STABLE_VER}" @@ -2249,7 +2257,7 @@ yad_info () { command -v "${pw_yad_v13_0}" &>/dev/null || fatal "yad not found" fi "${pw_yad_v13_0}" --no-wrap --text "$@" --width=400 --height=50 --borders=15 --title "INFO" \ - --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --image="$PW_GUI_ICON_PATH/info.png" \ + --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --image="$PW_GUI_ICON_PATH/info.svg" \ --center --text-align=center \ --button="OK"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png" 2>/dev/null } @@ -2262,7 +2270,7 @@ yad_error () { command -v "${pw_yad_v13_0}" &>/dev/null || fatal "yad not found" fi "${pw_yad_v13_0}" --no-wrap --text "$@" --width=400 --borders=15 --title "ERROR" \ - --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --image="$PW_GUI_ICON_PATH/error.png" \ + --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --image="$PW_GUI_ICON_PATH/error.svg" \ --center --text-align=center \ --button="EXIT"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png" 2>/dev/null } @@ -2274,7 +2282,7 @@ yad_error_download () { command -v "${pw_yad_v13_0}" &>/dev/null || fatal "yad not found" fi "${pw_yad_v13_0}" --text "$loc_gui_error_download" --width=400 --borders=15 --title "$loc_gui_error" \ - --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --image="$PW_GUI_ICON_PATH/download.png" \ + --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --image="$PW_GUI_ICON_PATH/download.svg" \ --no-wrap --center --text-align=center \ --button="$loc_skip"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":1 \ --button="$loc_repeat"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0 2>/dev/null @@ -2287,7 +2295,7 @@ yad_question () { command -v "${pw_yad_v13_0}" &>/dev/null || fatal "yad not found" fi "${pw_yad_v13_0}" --text "${1}" --width=400 --borders=15 --title "${inst_set}." \ - --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --image="$PW_GUI_ICON_PATH/question.png" \ + --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --image="$PW_GUI_ICON_PATH/question.svg" \ --no-wrap --center --text-align=center \ --button="$loc_cancel"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":1 \ --button="OK"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0 2>/dev/null @@ -2455,10 +2463,10 @@ pw_tray_icon () { --command="bash -c tray_icon_click" \ --tooltip="PortProton" \ --icon-size=32 --menu="| \ - ${loc_tray_winefile}!bash -c pw_tray_winefile!"$PW_GUI_ICON_PATH/wine_file.png"|| \ - ${loc_tray_tascmng}!bash -c pw_tray_taskmgr!"$PW_GUI_ICON_PATH/wine_system.png"|| \ - ${loc_tray_cangelog}!bash -c open_changelog!"$PW_GUI_ICON_PATH/history.png"|| \ - ${loc_tray_force_exit} !bash -c tray_icon_click_exit!"$PW_GUI_ICON_PATH/close.png"||" 2>/dev/null & + ${loc_tray_winefile}!bash -c pw_tray_winefile!"$PW_GUI_ICON_PATH/wine_file.svg"|| \ + ${loc_tray_tascmng}!bash -c pw_tray_taskmgr!"$PW_GUI_ICON_PATH/wine_system.svg"|| \ + ${loc_tray_cangelog}!bash -c open_changelog!"$PW_GUI_ICON_PATH/history.svg"|| \ + ${loc_tray_force_exit} !bash -c tray_icon_click_exit!"$PW_GUI_ICON_PATH/close.svg"||" 2>/dev/null & return 0 } @@ -2709,16 +2717,16 @@ gui_proton_downloader () { exit 0 fi - if [ ! -z `cat "${PORT_WINE_TMP_PATH}/tmp_proton_set" | awk '{print $1}'` ] ; then - export VERSION_WINE_GIT="`cat "${PORT_WINE_TMP_PATH}/tmp_proton_set"`" - elif [ ! -z `cat "${PORT_WINE_TMP_PATH}/tmp_proton_pw_set" | awk '{print $1}'` ] ; then - export VERSION_WINE_GIT="`cat "${PORT_WINE_TMP_PATH}/tmp_proton_pw_set"`" - elif [ ! -z `cat "${PORT_WINE_TMP_PATH}/tmp_kron4ek_set" | awk '{print $1}'` ] ; then - export VERSION_WINE_GIT="`cat "${PORT_WINE_TMP_PATH}/tmp_kron4ek_set"`" - elif [ ! -z `cat "${PORT_WINE_TMP_PATH}/tmp_ge_custom_set" | awk '{print $1}'` ] ; then - export VERSION_WINE_GIT="`cat "${PORT_WINE_TMP_PATH}/tmp_ge_custom_set"`" - elif [ ! -z `cat "${PORT_WINE_TMP_PATH}/tmp_installed_wine_set" | awk '{print $1}'` ] ; then - export VERSION_INSTALLED_WINE="`cat "${PORT_WINE_TMP_PATH}/tmp_installed_wine_set"`" + if [[ ! -z $(awk '{print $1}' "${PORT_WINE_TMP_PATH}/tmp_proton_set") ]] ; then + VERSION_WINE_GIT="$(cat "${PORT_WINE_TMP_PATH}/tmp_proton_set")" + elif [[ ! -z $(awk '{print $1}' "${PORT_WINE_TMP_PATH}/tmp_proton_pw_set") ]] ; then + VERSION_WINE_GIT="$(cat "${PORT_WINE_TMP_PATH}/tmp_proton_pw_set")" + elif [[ ! -z $(awk '{print $1}' "${PORT_WINE_TMP_PATH}/tmp_kron4ek_set") ]] ; then + VERSION_WINE_GIT="$(cat "${PORT_WINE_TMP_PATH}/tmp_kron4ek_set")" + elif [[ ! -z $(awk '{print $1}' "${PORT_WINE_TMP_PATH}/tmp_ge_custom_set") ]] ; then + VERSION_WINE_GIT="$(cat "${PORT_WINE_TMP_PATH}/tmp_ge_custom_set")" + elif [[ ! -z $(awk '{print $1}' "${PORT_WINE_TMP_PATH}/tmp_installed_wine_set") ]] ; then + VERSION_INSTALLED_WINE="$(cat "${PORT_WINE_TMP_PATH}/tmp_installed_wine_set")" else print_info "Nothing to do." export SKIP_CHECK_UPDATES=1 @@ -2737,7 +2745,7 @@ gui_proton_downloader () { fi for GIVE_WINE_URL in ${PROTON_GE_GIT[@]} ${PROTON_PW_GIT[@]} ${WINE_KRON4EK[@]} ${WINE_GE_CUSTOM[@]} ; do - if [ ! -z `echo ${GIVE_WINE_URL} | grep -i "${VERSION_WINE_GIT}"` ] ; then + if [ ! -z $(echo ${GIVE_WINE_URL} | grep -i "${VERSION_WINE_GIT}") ] ; then export URL_VERSION_PROTON_GIT="${GIVE_WINE_URL}" break fi @@ -2752,7 +2760,7 @@ gui_proton_downloader () { fi print_info "Download and install ${VERSION_WINE_GIT}..." - PW_WINE_ARCHIVE="$(echo ${URL_VERSION_PROTON_GIT} | awk -F'/' '{print $NF}' | awk -F'.tar' '{print $1}')" + PW_WINE_ARCHIVE="$(echo "${URL_VERSION_PROTON_GIT}" | awk -F'/' '{print $NF}' | awk -F'.tar' '{print $1}')" FILENAME="$(basename "${URL_VERSION_PROTON_GIT}")" if try_download "${URL_VERSION_PROTON_GIT}" "${PORT_WINE_PATH}/data/tmp/$FILENAME" ; then for archive_type in "gz" "xz" ; do @@ -2760,7 +2768,7 @@ gui_proton_downloader () { if unpack_tar_${archive_type} "${PORT_WINE_PATH}/data/tmp/${PW_WINE_ARCHIVE}.tar.${archive_type}" "${PORT_WINE_PATH}/data/dist/" ; then try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_ARCHIVE}.tar.${archive_type}" if [ ! -z "${portwine_exe}" ]; then - PW_WINE_USE="$(echo ${VERSION_WINE_GIT} | tr [[:lower:]] [[:upper:]])" + PW_WINE_USE="$(echo "${VERSION_WINE_GIT}" | tr [[:lower:]] [[:upper:]])" edit_db_from_gui PW_WINE_USE fi else @@ -3120,7 +3128,7 @@ portwine_delete_shortcut () { portwine_missing_shortcut () { "${pw_yad}" --title="${loc_gui_error}." --form \ --window-icon "$PW_GUI_ICON_PATH/portproton.svg" \ - --image "$PW_GUI_ICON_PATH/error.png" \ + --image "$PW_GUI_ICON_PATH/error.svg" \ --text "$loc_gui_missing_shortcut" \ --button="$loc_gui_delete_shortcut"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0 \ --button="$loc_cancel"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":1 @@ -3551,7 +3559,7 @@ export -f gui_rm_portproton gui_pw_update () { try_remove_file "${PORT_WINE_TMP_PATH}/scripts_update_notifier" print_info "Restarting PP for check update..." - export SKIP_CHECK_UPDATES=1 + export SKIP_CHECK_UPDATES=0 /usr/bin/env bash -c ${pw_full_command_line[*]} & exit 0 } diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index effbec27..7e77b147 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -4,11 +4,13 @@ unset update_loc if [[ -f "${PORT_WINE_TMP_PATH}/PortProton_loc" ]] ; then - read "update_loc" < "${PORT_WINE_TMP_PATH}/PortProton_loc" - export update_loc=${update_loc} + update_loc=$(cat "${PORT_WINE_TMP_PATH}/PortProton_loc") + export update_loc fi -if [[ "${FORCE_ENG_LANG}" == "1" ]] ; then +if ! check_flatpak \ +&& [[ -z "${LANG}" ]] ; then + export LANG=C export update_loc="ENG" else if [[ "${update_loc}" == "RUS" || "${update_loc}" == "ENG" ]] && [[ -f "${PORT_WINE_TMP_PATH}/PortProton_loc" ]] ; then @@ -18,7 +20,7 @@ else SET_LANG=$("${pw_yad_v13_0}" --title "LAUNGUAGE" --text "Select the language:" --list --radiolist \ --column="Set:" --column "Choose language:" TRUE "RUS" FALSE "ENG" \ --window-icon "$PW_GUI_ICON_PATH/portproton.svg" --width=300 --height=150) - SET_LANG="$(echo $SET_LANG | awk -F'|' '{print $2}')" + SET_LANG="$(echo "${SET_LANG}" | awk -F'|' '{print $2}')" echo "${SET_LANG}" > "${PORT_WINE_TMP_PATH}/PortProton_loc" if [[ ! -z "${SET_LANG}" ]] then export update_loc=${SET_LANG} @@ -28,7 +30,7 @@ else fi if [[ "${update_loc}" == "RUS" ]] ; then - check_flatpak && export LC_LANG=ru_RU.UTF-8 + check_flatpak && export LANG=ru_RU.UTF-8 export loc_gui_pw_reinstall_pp="Переустановить PortProton" export loc_gui_rm_pp="Удалить PortProton" @@ -85,10 +87,10 @@ if [[ "${update_loc}" == "RUS" ]] ; then export scripts_upd1="Обновление скриптов" export scripts_upd2="Доступно обновление скриптов для PortProton" - export scripts_upd3="Действие :" - export scripts_upd4="Обновить сейчас" - export scripts_upd5="Напомнить позже" - export scripts_upd6="Больше не напоминать" + export scripts_upd3="ВЫХОД" + export scripts_upd4="ОБНОВИТЬ СЕЙЧАС" + export scripts_upd5="НАПОМНИТЬ ПОЗЖЕ" + export scripts_upd6="НЕ НАПОМИНАТЬ" export port_clear_pfx="Вы действительно хотите очистить префикс PortProton?" @@ -501,10 +503,10 @@ elif [[ "${update_loc}" == "ENG" ]] ; then export scripts_upd1="New update for scripts" export scripts_upd2="Scripts update avialable for PortProton" - export scripts_upd3="Action:" - export scripts_upd4="Updating now" - export scripts_upd5="Remind me later" - export scripts_upd6="Do not remind me" + export scripts_upd3="EXIT" + export scripts_upd4="UPDATING NOW" + export scripts_upd5="REMIND ME LATER" + export scripts_upd6="DO NOT REMIND ME" export port_clear_pfx="Do you want to clear prefix in PortProton?" @@ -860,5 +862,4 @@ A brief instruction: export loc_gui_terminal="TERMINAL" export loc_gui_logo="LOGO" - fi diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index ed3fee72..5ddd3917 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -383,7 +383,7 @@ else then PW_GUI_SORT_TABS=(1 2 3 4 5) else PW_GUI_SORT_TABS=(2 3 4 5 1) fi - PW_GENERATE_BUTTONS="--field= $loc_create_shortcut_from_gui!${PW_GUI_ICON_PATH}/find_48.png!:FBTN%@bash -c \"button_click pw_find_exe\"%" + PW_GENERATE_BUTTONS="--field= $loc_create_shortcut_from_gui!${PW_GUI_ICON_PATH}/find_48.svg!:FBTN%@bash -c \"button_click pw_find_exe\"%" for PW_DESKTOP_FILES in ${PW_ALL_DF} ; do PW_NAME_D_ICON="$(cat "${PORT_WINE_PATH}/${PW_DESKTOP_FILES}" | grep Icon | awk -F= '{print $2}')" PW_NAME_D_ICON_48="${PW_NAME_D_ICON//".png"/"_48.png"}" diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index df46d5e4..6a165aa6 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=2280 +#SCRIPTS_NEXT_VERSION=2281 ######################################################################## export PW_MANGOHUD="0" export DEFAULT_MANGOHUD_CONFIG="arch,cpu_mhz,cpu_temp,engine_version,gamemode,gpu_core_clock,gpu_mem_clock,gpu_name,gpu_temp,ram,resolution,vkbasalt,vram,vulkan_driver,wine"