From 27a3962ecc5a97fba8bf9ab33649d4019862d87a Mon Sep 17 00:00:00 2001 From: Htylol Date: Sat, 28 Sep 2024 23:37:01 +0500 Subject: [PATCH 01/22] Updated background_pid, added returns for clear prefix, reinstall and delete PP --- data_from_portwine/scripts/functions_helper | 65 +++++++++++---------- data_from_portwine/scripts/start.sh | 10 +--- 2 files changed, 38 insertions(+), 37 deletions(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index d15d3b6..0dde9b6 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -679,23 +679,27 @@ background_pid () { local arg1=$1 # --start или --end local arg2=$2 # Название команды local arg3=$3 # Номер процесса (1,2,3..) - get_bg_pid () { - eval "echo \${$1}" - } - if [[ "$arg1" == --start ]] ; then - eval "$arg2 &" - PID=$! - export bg_pid"${arg3}"="$PID" - elif [[ "$arg1" == --end ]] ; then - PID=$(get_bg_pid bg_pid"${arg3}") - [[ $PID == "" ]] && return 1 - while true ; do - if [[ ! $(jobs -p) =~ $PID ]] ; then - return 0 - fi - sleep 0.005 - done + if [[ "$START_FROM_STEAM" == 1 ]] \ + || [[ -n "$PW_DEBUG" ]] ; then + case $arg1 in + --start) eval "$arg2" ;; + --end) : ;; + esac + else + get_bg_pid () { + eval "echo \${$1}" + } + case $arg1 in + --start) + eval "$arg2 &" + PID=$! + export bg_pid"${arg3}"="$PID" ;; + --end) + PID=$(get_bg_pid bg_pid"${arg3}") + [[ $PID == "" ]] && return 1 + wait "$PID" && return 0 ;; + esac fi } export -f background_pid @@ -849,19 +853,18 @@ pw_reinstall_pp () { echo "" exit 1 fi - elif ! yad_question "${translations[Do you really want to reinstall PortProton?\\nFor this, an internet connection will be required.]}" - then exit 1 + elif yad_question "${translations[Do you really want to reinstall PortProton?\\nFor this, an internet connection will be required.]}" ; then + pw_clear_pfx + try_remove_dir "${PORT_WINE_PATH}/data/dist" + create_new_dir "${PORT_WINE_PATH}/data/dist" + try_remove_dir "${PORT_WINE_TMP_PATH}/VULKAN" + try_remove_file "${PORT_WINE_TMP_PATH}/scripts_update_notifier" + try_remove_file "${PORT_WINE_PATH}/data/user.conf" + try_remove_file "${PORT_WINE_TMP_PATH}/scripts_ver" + echo "" + unset SKIP_CHECK_UPDATES + print_info "Restarting PP for reinstall files..." fi - pw_clear_pfx - try_remove_dir "${PORT_WINE_PATH}/data/dist" - create_new_dir "${PORT_WINE_PATH}/data/dist" - try_remove_dir "${PORT_WINE_TMP_PATH}/VULKAN" - try_remove_file "${PORT_WINE_TMP_PATH}/scripts_update_notifier" - try_remove_file "${PORT_WINE_PATH}/data/user.conf" - try_remove_file "${PORT_WINE_TMP_PATH}/scripts_ver" - echo "" - unset SKIP_CHECK_UPDATES - print_info "Restarting PP for reinstall files..." restart_pp } @@ -5874,8 +5877,8 @@ gui_clear_pfx () { if yad_question "${translations[Do you want to clear prefix in PortProton?]}" ; then pw_clear_pfx print_info "Restarting PP after clearing prefix..." - restart_pp fi + restart_pp } export -f gui_clear_pfx @@ -5886,8 +5889,9 @@ gui_rm_portproton () { rm -fr "${HOME}/PortWINE" rm -f "$(grep -il PortProton "${HOME}/.local/share/applications"/*.desktop)" update-desktop-database -q "${HOME}/.local/share/applications" + exit 0 fi - exit 0 + restart_pp } export -f gui_rm_portproton @@ -5988,6 +5992,7 @@ export -f change_gui_start gui_wine_uninstaller () { start_portwine pw_run uninstaller + stop_portwine --restart } export -f gui_wine_uninstaller diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index e9bb15f..210554f 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -257,11 +257,7 @@ if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] ; then PW_FILESYSTEM=$(stat -f -c %T "${PORT_WINE_PATH}") export PW_FILESYSTEM - if [[ "$START_FROM_STEAM" == 1 ]] ; then - pw_get_tmp_files - else - background_pid --start "pw_get_tmp_files" "1" - fi + background_pid --start "pw_get_tmp_files" "1" fi # create lock file @@ -802,7 +798,7 @@ fi [[ -n "$PW_YAD_SET" ]] && case "$PW_YAD_SET" in gui_pw_reinstall_pp|open_changelog|\ - 128|gui_pw_update|\ + 128|gui_pw_update|gui_rm_portproton|\ change_loc|gui_open_scripts_from_backup|\ gui_credits|pw_start_cont_xterm) if [[ -z "${PW_ALL_DF}" ]] ; then @@ -814,7 +810,7 @@ fi gui_proton_downloader|WINETRICKS|\ 116|pw_create_prefix_backup|\ gui_clear_pfx|WINEREG|WINECMD|\ - WINEFILE|WINECFG) + WINEFILE|WINECFG|gui_wine_uninstaller) if [[ -z "${PW_ALL_DF}" ]] ; then export TAB_MAIN_MENU="3" else From 985bea612c6fb1ca2ad1869c2cfb4f08df3fad07 Mon Sep 17 00:00:00 2001 From: Sergey Palcheh Date: Sun, 29 Sep 2024 13:41:45 +0600 Subject: [PATCH 02/22] Added games Blood and Soul --- data_from_portwine/img/gui/bloodandsoul.png | Bin 0 -> 5658 bytes .../scripts/pw_autoinstall/PW_BLOOD_AND_SOUL | 22 ++++++++++++++++++ data_from_portwine/scripts/start.sh | 1 + 3 files changed, 23 insertions(+) create mode 100644 data_from_portwine/img/gui/bloodandsoul.png create mode 100755 data_from_portwine/scripts/pw_autoinstall/PW_BLOOD_AND_SOUL diff --git a/data_from_portwine/img/gui/bloodandsoul.png b/data_from_portwine/img/gui/bloodandsoul.png new file mode 100644 index 0000000000000000000000000000000000000000..3662b099a41e3ff9892765cd58c65d8e09ed2199 GIT binary patch literal 5658 zcmV+#7Uk)QP)@IdV`JbZa#&33>lFbkr|ntS(R1U*_}|ORyCrFmRh3Kh<&j_%?i;H3;u&f z2w1|3Y5@xt2o|WJDIribT~lXDHDp!g7#VYf&u(VV-f%}2&ngPJo?LEb&-~r{edm1V zoGSo!c6LT(slO$V-x6>a5K`)7GKEVpDGhgJhHnCogHKnK=3ZTMK|m`30%8OaBL}-P zc4t$93!E$#%&Uf&5?U+rBF892wOryuqU}67lCBM=G%519U9u-Nzm< zI&w=J9#stwf+sTyAwVjDcab~S5BbAy{w_l;h_2<~^CN!o#Umb_Ua(lT=*$p(#5Nrf zK}uk)Mfk|A;U-!e9&}4o^t`QybW-sX+fr`qGaKzwU7QeOB&9T0QvHjSlK)D)bnWmT zBKT7w#1sG|Qb|mvct_m`)vV#jSW zArm=|bYe7niOj>|@&trLATDJR|5Qt<{#Xd6DMf^kBq0!5@^z#6O&j?O>-cD7__{V6 z&l^4?F&*Y8tuR{SLtrzX@Qts0i95G$0ANf(EIs28&{A{vnnona|M~D|%&VH*D2me1 zIgfLZ%qYAReBPWR3A{Dj;IFGQ9>*2CLa-A{YFm>}uaMPCLP}&N+pwR$Kkhbo4WA_S&yIbt;@1pYoQW=DlC}l9kfV?Qli-OJRfR_*UdF#dv21e6$p2fUD zYY8IZd_XCQ6oN0BB~RKV!)!>M67z0FXIq4`Tn{4gP7;Vh@7L0)uB2sCxe1IuR zOqNp=1)I|$FYWJgusNg570yShWrtEdpi@dn0a^;4wJRi&NipRjc09Uxh(VA-pqOk@ z76Ytpql__-q9qFz?}(CU8~!qvG{cPFpSL`7j*pB0>yc6dpaj^?@#_8|gF(*WOV`ml zC&dILgpequQCg!-Mpg_kdCq81vb{0l`p!0!vLG|EXQD2GgcK7}3ZxK70Z;35wzCl% zX2{&GsG198jGSE_({>FckV3%W>WHsI!FKZe$XTA1hTpc4m#pVIS`Yw|Aj>oo@Xm94 zcaL#7WICI&G24ZdNc}b_-vLSmZa?f>qY$O{Z@pl@}f0uBXYh+4jqx%(; znC2x18`~ITnC)$onVgs+qyR!7Bna8h2dyTwS1*!MhGw6ljqWCo=L2mGDCGu2Sr_o`08VrqdB^ zYe7ju<47?wEr#q)r)Zi4%4NCLr<0t&@_kYY6PoJ~D zxy{wh9gZ)T%w3I_{soYQ6o@E@Fq8rNeTfWh0sDk?OM8&7#2A< zoZx@@Ks@MML+K2^s7T2|63j+pCgl*VB-=ZiOg46rD(}mh0*OcxkWj<~LMWoMy#M2$ z@ZY}w19Bnx{dc~`we6dH{K-SkPToiRfXpQ>IzmW<5c?|jkRmS%j#hJSl-q1{5cG=N z45^w5od`7TIY~(lg<|OfpOqQY%&@3x#^WI|ru7#l_NG&$5-ht4E)r)y{5~;h23gMT zY?G_|d&r{f@sa|et2ugfp9lB9;Pz~b+j|F$1_wO+k;33Tf(@u_2y=iKNLk5s@F18m#TbryiG=@2PVYR$5# z`1o0kC<<23pL03?0P8Hd&bYd_$2Z=6mp9*f6NDmoOS`({^5T@S$(gDg*GfKpbf2e- zz{i*OcyM-)fMY;T0;G~iArVp_*VEbLC3#*@*Ap)SS7N zFLKCSz&THfiOcyC-&wRs4Dy0$Hs;RlJKTBWE?sA-=Et}Y)nZ9G91?t> zSuMG^Sdqwx!SVR{37?#t^6BE3yv*>aWotY^3Pl$jS}8(I2qjQLy%3DWa6(-#2+8w& zbxJEDJF}Z;;Ulj_O=%q;;1JT_y~le`Oc7^&-;)AHjFHWhvqzCn+GjvU>Oh+fvQbAl z$Vf=4<%(i5f#9iEOX@a|q$VcMaWkjM9WURwj$2(Y+26-I#nECxp7-1yLm;I!lSzpX zis5jJ#lc_4=5d?JaCuf{^IEAjU`_^%7*Z$vC#WvHJ!m&lb$%3|VFzogEQ^ zAP9#e00AKtMj4z7Boaz%vZBO$i}MyC1StlziJlK!$9W7CT9QPMe%Ez`7>O}L0w)3| z=@Q(ERa+6}kjc*`6_;j5#|$L!`*dHxC&L&Fo;G>#x3sU7iu6Cm&2G2P1MV zXk%i2ddBYFRf<_jKGnER)6|A~m2>6k7GE4cA*Do$prk}8g%AR5GJ=n2os$(KoINKc zXxjz)Tqa^jXeCfu;%(|}n@l(xkW!Lq2~v=o5n38@m80s&ot=wSmX0*TRdi;a=yeBoKlSDYO^VYYvbexEf$_W$=_Z;!!epVBx-46*mvMk9nk zNkvi$Ya0f`4Vu-06az6PwCDvSQcDt&5IssJVoZ1+ky;RAB-4iRuw;0RGGAK&Q zEJskSCp(y|K&gfVD5Z%pAf=)ljHwpq2$|5{$0QZ_5Qy}nJf>dOiuKGMnk^z z(gCySE;kQfVQYIvK2(&$3B_PY3J#(t&j*AM@U}(g1?6Z!h)bMJESDAaszPTaLMi}K zjO1EV<~aZ%MTC@SZP40~QbMU-V#g53@*zT;_ZzRIpzXT;i&7$`h!25~BB_7zh3*yt zX44V-*RQg7>wwAL7Q@XQbkVEP=vzYYq}YQt`4*C5Fq$$bB%MoCbm1G}b|y2D z2X8~a*w}+S1WyVc9}*!ZqIG2Dh;le3H6t*aeLYrGhxd($KYq(}@N z=v!DR5cE=7DUDJZ0m#<2>z(hFq!5ru1n)`f9{?XbopoF+Di)`wbk&MrEzt*vkrcwO zuM`n3AUwpbC0U0;ur)dQi}@)r_MZ(Qtn(gvDJ}ZV3()})XFHs4*R@I@BvNS- z5gj8hZb%`nC2eo-5NmCs0PFXy{r?v0k)oICTK2!O){|*Xiisq8E*40% z5@be0gqYxTv7+nRwR!glZ%NT3ltifB6K3U*C!c-FkAL`o**(}r7m8>*=Cz<48HU3N zc`+nL2tE*l$95edL}FSmLL_1gMEbnSTTcv*xV9av7pi|1C8m^cF7z5c^^>$u2{cA2 z7EMjA42#BcKA*F*)lg&xBl`zWNfU%b1WAgCgS&6>J6oG%TJq`7e#qYS0rjdSFG~i) z0&Q}F_b;x_T3Tm&3<`SgPl@0<#6Zw>E#6zC%zIp<*bg}&)Vln=_W4ztAqAv_50S85 zc4Iq~QanGui^lV>DvDarv-YMiw= z+hLuhvAuNZTLZK*bX`N&c8sUc)=PqS$Sfy#+mAu5&_YD|Ok-`t*UYJ;K*+vKtGdPe zKnRht$a#Lb;IdkhXXZr=f=-Ae*42zXc%?+ioUz%(F9NHNmaJxT)X0!X{R4K6w&_?l z9a?H!2y0KQ=$cg@*91?qs@Abh#QP42>xC)}sb`;GMI15o*-oD>$R21h;=QMCTQ2Jr z=hcEySyC1mK2r!M5Jn<(PjS*H{L*pq=Z|Qg2u`ZUJU)8Bf+d690y_;HzIv6-t&Him zVRSConq-u@Ac_p@JWbazHbb262*Ht(KntN6tFN?-X2{NN&A8 zW9Rx7!ZtiTy5Mpt+1h9sjY{@+U*`C%V!m=*mRq!xEb4|t1gQ{G;@ef<>3!VO3o5N7 zF(raeAOzkgic-U@|H(TJ+2%dg@)A&H2&)_yNby9aNG7&a%EAjaFz0Rc#?eQj7#2dtVv@Vh!{JG}iI?vm-XgpE4Sh7^5j;L>Wa^ z8gAX*g5?mO2*}oNvWw#$*OJ;QlYhxWSJp`h$8jU8D7j_V@yAoTGkRFl9HhA zI(~BRA(O!XnFKFg+orl~i1Uj5tDe2XGZ@jX_ z;m!`$2JSt6hI1EGbxYS-vSNVqb{#VXLiB_v>8ceci{*>pIHrh>F`|_~NQv{2JU1wv z&?du2k9Qu0z!;5l9#Y>fF~YKG_}YA`Yu2F$z!~Lru8hB4a*M7 zvSepxm(9tTgV~IO?Jde8=VDPaUoJRbRCGSj*aoE)LP_G9Qf+5@F)1}7_02^Jm~4di z9_?IYzGxYgh9Wa$d4@I_38)qoZRiDFZVX~5aMsau78?UiXE8=`adE_d{rC5|fA2ZY z3K}$>lc-Gc=B-2i_Itkt(IXJV5U|#ILG3N)|{If?hdDrSQR{dk-LpN#MN0+MYHez59tVQDiw+_O|(( z@4U`$e(6o#e*HCug90A{N*B~s#lhiq4zJ!|I2th?kBBK@oug}NthG2FI6c4M?Bo(6 zRGs6qCr`LooRMcaAq0fhr0DS>^di0wR}t$YSt(Vo)082_MDQItgx=*i*BhI#9_3}3 z@zT{Ry!{)m^X`}4;+31%nQd&6Wd>pRJy?kr9vpr)vonnkZu1_0&6>O#0M=eq+NP-v~P19hzma1BE za&pS)(J?VbCL5cKr&IDQqZkxOsR$wP;fEjc`MvvuromTp3Zocq?T~Nm@cDyBJU(BM z5Wt`pBR>DDzxbeY?khg{zGN{V#kyQVl44I? ze(juM=)*2+Ew=0WaVHec2b}HJOp*~}#C9!<`J9vE3l>#{k)ABiIKP}zUCv2$MNyO# z(-{xXm)t*|^Z4j--$Ep`>~kT2OqBqbq9jC5+bkiapK6c%w{2tpc?jLK_mFEBpZX)7 z7(CuPx~}VUQrF>}qiY+Q)e2`V)<&WfC}q}}Xiixalx5CnH00x-e}s#Id~?dyWPp%h zvYdL>l&)2WKar}1T7^+S3+}%dRAk45#na)1CJbw1=%G+;0ID4@Ce^v4eI_pBMM*si-07*qoM6N<$g0X;< Ai~s-t literal 0 HcmV?d00001 diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_BLOOD_AND_SOUL b/data_from_portwine/scripts/pw_autoinstall/PW_BLOOD_AND_SOUL new file mode 100755 index 0000000..73690a6 --- /dev/null +++ b/data_from_portwine/scripts/pw_autoinstall/PW_BLOOD_AND_SOUL @@ -0,0 +1,22 @@ +#!/usr/bin/env bash +# Author: chal55rus (Sergey P.) +######################################################################## +export PW_PREFIX_NAME="BLOOD_AND_SOUL" +export LAUNCH_PARAMETERS=("/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-") +export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/bs-install.exe" +export PORTWINE_CREATE_SHORTCUT_NAME="Blood and Soul" + +start_portwine +if try_download "https://bsclassic.com/files/bs-install.exe" "${PW_AUTOINSTALL_EXE}" no_mirror +then + pw_start_progress_bar_install_game "Blood and Soul ..." + pw_run "${PW_AUTOINSTALL_EXE}" + portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Blood and Soul Classic/launcher.exe" + try_remove_file "${PW_AUTOINSTALL_EXE}" + try_remove_file "${portwine_exe}.ppdb" + kill_portwine + pw_stop_progress_bar + + portwine_create_shortcut +fi +stop_portwine diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index e9bb15f..003ea51 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -744,6 +744,7 @@ else --field=" Anomaly Zone"!"$PW_GUI_ICON_PATH/anomalyzone.png"!"":"FBTN" '@bash -c "button_click --normal PW_ANOMALY_ZONE"' \ --field=" Farlight 84"!"$PW_GUI_ICON_PATH/farlight84.png"!"":"FBTN" '@bash -c "button_click --normal PW_FARLIGHT84"' \ --field=" Secret World Legends (ENG)"!"$PW_GUI_ICON_PATH/swl.png"!"":"FBTN" '@bash -c "button_click --normal PW_SWL"' \ + --field=" Blood and Soul"!"$PW_GUI_ICON_PATH/bloodandsoul.png"!"":"FBTN" '@bash -c "button_click --normal PW_BLOOD_AND_SOUL"' \ 2>/dev/null & export START_FROM_PP_GUI="1" From 96e4ccc3540ed5e1723d21fc0c197c80662dc97e Mon Sep 17 00:00:00 2001 From: Sergey Palcheh Date: Sun, 29 Sep 2024 13:58:28 +0600 Subject: [PATCH 03/22] Added game Star Conflict --- data_from_portwine/img/gui/starconflict.png | Bin 0 -> 7200 bytes .../scripts/pw_autoinstall/PW_STARCONFLICT | 22 ++++++++++++++++++ data_from_portwine/scripts/start.sh | 1 + 3 files changed, 23 insertions(+) create mode 100755 data_from_portwine/img/gui/starconflict.png create mode 100755 data_from_portwine/scripts/pw_autoinstall/PW_STARCONFLICT diff --git a/data_from_portwine/img/gui/starconflict.png b/data_from_portwine/img/gui/starconflict.png new file mode 100755 index 0000000000000000000000000000000000000000..3c2542cf875940db63716af396d30840fa2bf650 GIT binary patch literal 7200 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 literal 0 HcmV?d00001 diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_STARCONFLICT b/data_from_portwine/scripts/pw_autoinstall/PW_STARCONFLICT new file mode 100755 index 0000000..51327d4 --- /dev/null +++ b/data_from_portwine/scripts/pw_autoinstall/PW_STARCONFLICT @@ -0,0 +1,22 @@ +#!/usr/bin/env bash +# Author: chal55rus +######################################################################## +export PW_PREFIX_NAME="STARCONFLICT" +export LAUNCH_PARAMETERS=("/VERYSILENT") +export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/starconf_launcher_1.0.3.10.exe" +export PORTWINE_CREATE_SHORTCUT_NAME="Star Conflict" + +start_portwine +if try_download "https://yupmaster.gaijinent.com/launcher/current.php?id=StarConflictLauncher" "${PW_AUTOINSTALL_EXE}" no_mirror +then + pw_start_progress_bar_install_game "Star Conflict ..." + pw_kill_autostart launcher.exe & + pw_run "${PW_AUTOINSTALL_EXE}" + portwine_exe="${WINEPREFIX}/drive_c/users/steamuser/AppData/Local/StarConflict/launcher.exe" + try_remove_file "${PW_AUTOINSTALL_EXE}" + kill_portwine + pw_stop_progress_bar + + portwine_create_shortcut +fi +stop_portwine diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 003ea51..122313c 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -745,6 +745,7 @@ else --field=" Farlight 84"!"$PW_GUI_ICON_PATH/farlight84.png"!"":"FBTN" '@bash -c "button_click --normal PW_FARLIGHT84"' \ --field=" Secret World Legends (ENG)"!"$PW_GUI_ICON_PATH/swl.png"!"":"FBTN" '@bash -c "button_click --normal PW_SWL"' \ --field=" Blood and Soul"!"$PW_GUI_ICON_PATH/bloodandsoul.png"!"":"FBTN" '@bash -c "button_click --normal PW_BLOOD_AND_SOUL"' \ + --field=" Star Conflict (ENG)"!"$PW_GUI_ICON_PATH/starconflict.png"!"":"FBTN" '@bash -c "button_click --normal PW_STARCONFLICT"' \ 2>/dev/null & export START_FROM_PP_GUI="1" From afba3864de7da85e6924bbdfcf1bbdc8481f4027 Mon Sep 17 00:00:00 2001 From: ValoKarDin <112694056+valokardin@users.noreply.github.com> Date: Sun, 29 Sep 2024 13:12:56 +0300 Subject: [PATCH 04/22] Update PW_WOSB Fix autoinstall --- .../scripts/pw_autoinstall/PW_WOSB | 26 +++---------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_WOSB b/data_from_portwine/scripts/pw_autoinstall/PW_WOSB index 86fd0e3..c70dcd8 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_WOSB +++ b/data_from_portwine/scripts/pw_autoinstall/PW_WOSB @@ -1,10 +1,11 @@ #!/usr/bin/env bash # Author: Cefeiko ######################################################################## +LAUNCH_PARAMETERS=("/S") export PW_PREFIX_NAME="DOTNET" export PW_DLL_INSTALL="faudio dotnet48" export PW_VULKAN_USE=1 -export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/wos_client.exe" +export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/installer.exe" WOSB_VERSION="$(curl -s --list-only --connect-timeout 3 https://www.worldofseabattle.com/download2 2>/dev/null | grep 'installer.exe' | awk -F'xsolla-launcher-update/' '{print $2}' | awk -F'/' '{print $1}')" [[ -n "$WOSB_VERSION" ]] && print_info "Found version: $WOSB_VERSION" || yad_error "Error while get version of WOSB INSTALLER." @@ -13,11 +14,10 @@ start_portwine if try_download "https://installer.launcher.xsolla.com/xlauncher-builds/xsolla-launcher-update/${WOSB_VERSION}/bin/installer.exe" "${PW_AUTOINSTALL_EXE}" no_mirror then pw_start_progress_bar_block "Installing World of Sea Battle." - create_new_dir "$WINEPREFIX/drive_c/WoSB" - "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/WoSB" + pw_run "${PW_AUTOINSTALL_EXE}" try_remove_file "${PW_AUTOINSTALL_EXE}" try_remove_file "${portwine_exe}.ppdb" - portwine_exe="$WINEPREFIX/drive_c/WoSB/launcher.exe" + portwine_exe="$WINEPREFIX/drive_c/users/steamuser/AppData/Local/Wosb Launcher/launcher.exe" pw_stop_progress_bar export PW_NO_RESTART_PPDB="1" @@ -36,21 +36,3 @@ then fi stop_portwine - - - - -start_portwine -if try_download "${PW_URL_CEMU}" "${PW_AUTOINSTALL_EXE}" no_mirror -then - pw_start_progress_bar_install_game "Cemu." - - portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/`echo ${PW_URL_CEMU} | awk -F/ '{print $5}' | sed 's/.zip//'`/Cemu.exe" - try_remove_file "${PW_AUTOINSTALL_EXE}" - try_remove_file "${portwine_exe}.ppdb" - kill_portwine - pw_stop_progress_bar - export PORTWINE_CREATE_SHORTCUT_NAME="Cemu" - portwine_create_shortcut -fi -stop_portwine From 16b09c2ae006d03586df5c655c7eeb10f3b47037 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Sun, 29 Sep 2024 16:25:47 +0300 Subject: [PATCH 05/22] updated DXVK and VKD3D, + autoinstall --- data_from_portwine/changelog_en | 2 +- data_from_portwine/changelog_ru | 10 +++++++++- .../scripts/pw_autoinstall/PW_BLOOD_AND_SOUL | 2 +- .../{PW_STARCONFLICT => PW_STAR_CONFLICT} | 6 +++--- data_from_portwine/scripts/pw_autoinstall/PW_VBA-M | 1 + data_from_portwine/scripts/start.sh | 2 +- data_from_portwine/scripts/var | 4 ++-- 7 files changed, 18 insertions(+), 9 deletions(-) rename data_from_portwine/scripts/pw_autoinstall/{PW_STARCONFLICT => PW_STAR_CONFLICT} (79%) diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en index 20596e4..51a262f 100755 --- a/data_from_portwine/changelog_en +++ b/data_from_portwine/changelog_en @@ -3,7 +3,7 @@ You can help us in the development of the project on the website: https://linux- Changelog: ###Scripts version 2356### / stable / Date: 28.09.2024 / Download update size: 4 megabytes -* Fixed work in steam and ingame +* fixed work in steam and ingame ###Scripts version 2355### / stable / Date: 28.09.2024 / Download update size: 385 megabytes * cumulative update to the stable version of PortProton scripts diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru index 7b306f2..14bf47b 100755 --- a/data_from_portwine/changelog_ru +++ b/data_from_portwine/changelog_ru @@ -2,8 +2,16 @@ ----------------------------------------- История изменений: +; * обновлен PROTON_LG до версии "9-15" +* обновлены версии: + * DXVK_GIT "2.4.1-74" + * VKD3D_GIT "1.1-4202" +* добавлена автоустановка игры "Star Conflict" (спасибо Chal55rus) +* добавлена автоустановка игры "Blood and Soul" (спасибо Chal55rus) + + ###Scripts version 2356### / stable / Дата: 28.09.2024 / Размер скачиваемого обновления: 4 мегабайт -* Исправлена работа в steam и ingame +* исправлена работа в steam и ingame ###Scripts version 2355### / stable / Дата: 28.09.2024 / Размер скачиваемого обновления: 385 мегабайт * кумулятивное обновление стабильной версии скриптов PortProton diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_BLOOD_AND_SOUL b/data_from_portwine/scripts/pw_autoinstall/PW_BLOOD_AND_SOUL index 73690a6..8109fcd 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_BLOOD_AND_SOUL +++ b/data_from_portwine/scripts/pw_autoinstall/PW_BLOOD_AND_SOUL @@ -9,7 +9,7 @@ export PORTWINE_CREATE_SHORTCUT_NAME="Blood and Soul" start_portwine if try_download "https://bsclassic.com/files/bs-install.exe" "${PW_AUTOINSTALL_EXE}" no_mirror then - pw_start_progress_bar_install_game "Blood and Soul ..." + pw_start_progress_bar_install_game "Blood and Soul." pw_run "${PW_AUTOINSTALL_EXE}" portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Blood and Soul Classic/launcher.exe" try_remove_file "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_STARCONFLICT b/data_from_portwine/scripts/pw_autoinstall/PW_STAR_CONFLICT similarity index 79% rename from data_from_portwine/scripts/pw_autoinstall/PW_STARCONFLICT rename to data_from_portwine/scripts/pw_autoinstall/PW_STAR_CONFLICT index 51327d4..cf51eb1 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_STARCONFLICT +++ b/data_from_portwine/scripts/pw_autoinstall/PW_STAR_CONFLICT @@ -1,15 +1,15 @@ #!/usr/bin/env bash # Author: chal55rus ######################################################################## -export PW_PREFIX_NAME="STARCONFLICT" +export PW_PREFIX_NAME="STAR_CONFLICT" export LAUNCH_PARAMETERS=("/VERYSILENT") -export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/starconf_launcher_1.0.3.10.exe" +export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/starconf_installer.exe" export PORTWINE_CREATE_SHORTCUT_NAME="Star Conflict" start_portwine if try_download "https://yupmaster.gaijinent.com/launcher/current.php?id=StarConflictLauncher" "${PW_AUTOINSTALL_EXE}" no_mirror then - pw_start_progress_bar_install_game "Star Conflict ..." + pw_start_progress_bar_install_game "Star Conflict." pw_kill_autostart launcher.exe & pw_run "${PW_AUTOINSTALL_EXE}" portwine_exe="${WINEPREFIX}/drive_c/users/steamuser/AppData/Local/StarConflict/launcher.exe" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_VBA-M b/data_from_portwine/scripts/pw_autoinstall/PW_VBA-M index 54b2625..cb7707b 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_VBA-M +++ b/data_from_portwine/scripts/pw_autoinstall/PW_VBA-M @@ -2,6 +2,7 @@ # Author: chal55rus (Sergey P.) ######################################################################## export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/visualboyadvance-m-Win-x86_64.zip" + start_portwine if try_download "https://github.com/visualboyadvance-m/visualboyadvance-m/releases/latest/download/visualboyadvance-m-Win-x86_64.zip" "${PW_AUTOINSTALL_EXE}" no_mirror then diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 122313c..6c48e7f 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -745,7 +745,7 @@ else --field=" Farlight 84"!"$PW_GUI_ICON_PATH/farlight84.png"!"":"FBTN" '@bash -c "button_click --normal PW_FARLIGHT84"' \ --field=" Secret World Legends (ENG)"!"$PW_GUI_ICON_PATH/swl.png"!"":"FBTN" '@bash -c "button_click --normal PW_SWL"' \ --field=" Blood and Soul"!"$PW_GUI_ICON_PATH/bloodandsoul.png"!"":"FBTN" '@bash -c "button_click --normal PW_BLOOD_AND_SOUL"' \ - --field=" Star Conflict (ENG)"!"$PW_GUI_ICON_PATH/starconflict.png"!"":"FBTN" '@bash -c "button_click --normal PW_STARCONFLICT"' \ + --field=" Star Conflict (ENG)"!"$PW_GUI_ICON_PATH/starconflict.png"!"":"FBTN" '@bash -c "button_click --normal PW_STAR_CONFLICT"' \ 2>/dev/null & export START_FROM_PP_GUI="1" diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index d2615f0..503ecd2 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -55,9 +55,9 @@ export PW_VULKAN_USE="2" export VKD3D_LIMIT_TESS_FACTORS="64" export DXVK_LEGACY_VER="1.6.1" export DXVK_STABLE_VER="1.10.3-28" -export DXVK_GIT_VER="2.4-94" +export DXVK_GIT_VER="2.4.1-74" export VKD3D_STABLE_VER="1.1-2602" -export VKD3D_GIT_VER="1.1-4191" +export VKD3D_GIT_VER="1.1-4202" ###VKBASALT### export PW_VKBASALT_EFFECTS="Curves:cas" export PW_VKBASALT_FFX_CAS="0.66" From 6f1b9f6afcd9e93cdf040e8450306f46071bde6c Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Sun, 29 Sep 2024 17:29:32 +0300 Subject: [PATCH 06/22] fixed get ppdb for symlink --- data_from_portwine/changelog_ru | 9 ++++-- .../WORLD OF SEA BATTLE (TEXT 2 RU).ppdb | 18 ----------- ...E (TEXT EN).ppdb => WorldOfSeaBattle.ppdb} | 10 +++---- .../scripts/pw_autoinstall/PW_FARLIGHT84 | 2 +- .../scripts/pw_autoinstall/PW_GAMEFORGE | 2 +- .../scripts/pw_autoinstall/PW_HO_YO_PLAY | 2 +- .../scripts/pw_autoinstall/PW_WGC | 2 +- .../{PW_WOSB => PW_WORLD_OF_SEA_BATTLE} | 30 ++++++------------- data_from_portwine/scripts/start.sh | 11 +++---- data_from_portwine/scripts/var | 2 +- 10 files changed, 30 insertions(+), 58 deletions(-) delete mode 100644 data_from_portwine/scripts/portwine_db/WORLD OF SEA BATTLE (TEXT 2 RU).ppdb rename data_from_portwine/scripts/portwine_db/{WORLD OF SEA BATTLE (TEXT EN).ppdb => WorldOfSeaBattle.ppdb} (72%) rename data_from_portwine/scripts/pw_autoinstall/{PW_WOSB => PW_WORLD_OF_SEA_BATTLE} (51%) diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru index 14bf47b..86259db 100755 --- a/data_from_portwine/changelog_ru +++ b/data_from_portwine/changelog_ru @@ -2,12 +2,15 @@ ----------------------------------------- История изменений: -; * обновлен PROTON_LG до версии "9-15" +* обновлен PROTON_LG до версии "9-15" * обновлены версии: * DXVK_GIT "2.4.1-74" * VKD3D_GIT "1.1-4202" -* добавлена автоустановка игры "Star Conflict" (спасибо Chal55rus) -* добавлена автоустановка игры "Blood and Soul" (спасибо Chal55rus) +* добавлена автоустановка "Star Conflict" (спасибо Chal55rus) +* добавлена автоустановка "Blood and Soul" (спасибо Chal55rus) +* обновлена автоустановка "World of Sea Battle" (спасибо valokardin) +* "World of Sea Battle" больше не нужен префикс DOTNET и от + ###Scripts version 2356### / stable / Дата: 28.09.2024 / Размер скачиваемого обновления: 4 мегабайт diff --git a/data_from_portwine/scripts/portwine_db/WORLD OF SEA BATTLE (TEXT 2 RU).ppdb b/data_from_portwine/scripts/portwine_db/WORLD OF SEA BATTLE (TEXT 2 RU).ppdb deleted file mode 100644 index 18cd27c..0000000 --- a/data_from_portwine/scripts/portwine_db/WORLD OF SEA BATTLE (TEXT 2 RU).ppdb +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash -#Author: Cefeiko -#wosb_launcher_ru.exe -#Rating=? -################################################ -export PW_COMMENT_DB="С этим ДБ файлом писать на АНГЛИЙСКОМ не получится. -Для входа в игру используйте ярлык World of Sea Battle EN" -export PW_PREFIX_NAME="DOTNET" -export PW_WINDOWS_VER="10" -export PW_VULKAN_USE="2" -export WINEDLLOVERRIDES="vulkan-1=n,b" -export PW_NO_ESYNC="1" -export PW_USE_D3D_EXTRAS="1" -export PW_USE_GSTREAMER="1" -export PW_FORCE_LARGE_ADDRESS_AWARE="1" -export PW_USE_SHADER_CACHE="1" -export LAUNCH_PARAMETERS="" - diff --git a/data_from_portwine/scripts/portwine_db/WORLD OF SEA BATTLE (TEXT EN).ppdb b/data_from_portwine/scripts/portwine_db/WorldOfSeaBattle.ppdb similarity index 72% rename from data_from_portwine/scripts/portwine_db/WORLD OF SEA BATTLE (TEXT EN).ppdb rename to data_from_portwine/scripts/portwine_db/WorldOfSeaBattle.ppdb index 7278557..c1277df 100644 --- a/data_from_portwine/scripts/portwine_db/WORLD OF SEA BATTLE (TEXT EN).ppdb +++ b/data_from_portwine/scripts/portwine_db/WorldOfSeaBattle.ppdb @@ -1,12 +1,11 @@ #!/usr/bin/env bash -#Author: Cefeiko -#wosb_launcher_en.exe -#Rating=? +#Author: Cefeiko, Fidel +#wosb_launcher_pp.exe +#Rating=5 ################################################ export PW_COMMENT_DB="" -export PW_PREFIX_NAME="DOTNET" export PW_WINDOWS_VER="10" -export PW_VULKAN_USE="2" +export PW_VULKAN_USE="1" export WINEDLLOVERRIDES="vulkan-1=n,b" export PW_NO_ESYNC="1" export PW_USE_D3D_EXTRAS="1" @@ -14,4 +13,3 @@ export PW_USE_GSTREAMER="1" export PW_FORCE_LARGE_ADDRESS_AWARE="1" export PW_USE_SHADER_CACHE="1" export LAUNCH_PARAMETERS="" -export LANG=en_US.UTF-8 diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_FARLIGHT84 b/data_from_portwine/scripts/pw_autoinstall/PW_FARLIGHT84 index cd6b562..5e6edd6 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_FARLIGHT84 +++ b/data_from_portwine/scripts/pw_autoinstall/PW_FARLIGHT84 @@ -8,7 +8,7 @@ export PW_PREFIX_NAME="FARLIGHT_84" start_portwine if try_download "https://static-gl.lilithgame.com/p/pcsdk/launcher/10060/prodef4621e968ad6b383b8754148b63/0/launcher/res/release/Farlight84_setup_1.3.0.1_238.exe" "${PW_AUTOINSTALL_EXE}" no_mirror then - pw_start_progress_bar_block "Farlight 84." + pw_start_progress_bar_install_game "Farlight 84." create_new_dir "$WINEPREFIX/drive_c/Program Files (x86)/Farlight84" "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)/Farlight84" "$pw_7z" x -y "$WINEPREFIX/drive_c/Program Files (x86)/Farlight84/launcher.7z" -o"$WINEPREFIX/drive_c/Program Files (x86)/Farlight84" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_GAMEFORGE b/data_from_portwine/scripts/pw_autoinstall/PW_GAMEFORGE index 02d4b1c..ed2c30d 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_GAMEFORGE +++ b/data_from_portwine/scripts/pw_autoinstall/PW_GAMEFORGE @@ -24,7 +24,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/GameforgeInstaller.exe" start_portwine if try_download "https://raw.githubusercontent.com/WarfaceZ/lutris-clients/master/GameforgeInstaller.exe" "${PW_AUTOINSTALL_EXE}" then - pw_start_progress_bar_block "Gameforge-Client." + pw_start_progress_bar_install_game "Gameforge-Client." pw_shutdown_please SparkWebHelper.exe & pw_run "${PW_AUTOINSTALL_EXE}" portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/GameforgeClient/gfclient.exe" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_HO_YO_PLAY b/data_from_portwine/scripts/pw_autoinstall/PW_HO_YO_PLAY index 46e9788..cb998df 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_HO_YO_PLAY +++ b/data_from_portwine/scripts/pw_autoinstall/PW_HO_YO_PLAY @@ -10,7 +10,7 @@ start_portwine if try_download "https://sg-public-api.hoyoverse.com/event/download_porter/trace/hyp_global/hyphoyoverse/default?url=https%3A%2F%2Fhoyoplay.hoyoverse.com%2F" "${PW_AUTOINSTALL_EXE}" no_mirror then - pw_start_progress_bar_block "Installing HoYoPlay Launcher." + pw_start_progress_bar_install_game "HoYoPlay Launcher." pw_kill_autostart HYP.exe & export PATH_TO_GAME="${PW_USER_TEMP}" pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_WGC b/data_from_portwine/scripts/pw_autoinstall/PW_WGC index 67017fb..f9211ed 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_WGC +++ b/data_from_portwine/scripts/pw_autoinstall/PW_WGC @@ -10,7 +10,7 @@ start_portwine if try_download "https://redirect.wargaming.net/WGC/Wargaming_Game_Center_Install_WoT_${WGC_LOC}.exe" "${PW_AUTOINSTALL_EXE}" no_mirror then - pw_start_progress_bar_block "Starting WGC installation..." + pw_start_progress_bar_install_game "WGC." pw_kill_autostart wgc.exe & pw_run "${PW_AUTOINSTALL_EXE}" portwine_exe="$WINEPREFIX/drive_c/ProgramData/Wargaming.net/GameCenter/api/wgc_api.exe" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_WOSB b/data_from_portwine/scripts/pw_autoinstall/PW_WORLD_OF_SEA_BATTLE similarity index 51% rename from data_from_portwine/scripts/pw_autoinstall/PW_WOSB rename to data_from_portwine/scripts/pw_autoinstall/PW_WORLD_OF_SEA_BATTLE index c70dcd8..eb20ca9 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_WOSB +++ b/data_from_portwine/scripts/pw_autoinstall/PW_WORLD_OF_SEA_BATTLE @@ -1,11 +1,11 @@ #!/usr/bin/env bash # Author: Cefeiko ######################################################################## -LAUNCH_PARAMETERS=("/S") -export PW_PREFIX_NAME="DOTNET" -export PW_DLL_INSTALL="faudio dotnet48" -export PW_VULKAN_USE=1 +export LAUNCH_PARAMETERS=("/S") +export PW_PREFIX_NAME="WORLD_OF_SEA_BATTLE" +export PW_VULKAN_USE="1" export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/installer.exe" +export PORTWINE_CREATE_SHORTCUT_NAME="World of Sea Battle" WOSB_VERSION="$(curl -s --list-only --connect-timeout 3 https://www.worldofseabattle.com/download2 2>/dev/null | grep 'installer.exe' | awk -F'xsolla-launcher-update/' '{print $2}' | awk -F'/' '{print $1}')" [[ -n "$WOSB_VERSION" ]] && print_info "Found version: $WOSB_VERSION" || yad_error "Error while get version of WOSB INSTALLER." @@ -13,26 +13,14 @@ WOSB_VERSION="$(curl -s --list-only --connect-timeout 3 https://www.worldofseaba start_portwine if try_download "https://installer.launcher.xsolla.com/xlauncher-builds/xsolla-launcher-update/${WOSB_VERSION}/bin/installer.exe" "${PW_AUTOINSTALL_EXE}" no_mirror then - pw_start_progress_bar_block "Installing World of Sea Battle." + pw_start_progress_bar_install_game "World of Sea Battle." pw_run "${PW_AUTOINSTALL_EXE}" try_remove_file "${PW_AUTOINSTALL_EXE}" try_remove_file "${portwine_exe}.ppdb" - portwine_exe="$WINEPREFIX/drive_c/users/steamuser/AppData/Local/Wosb Launcher/launcher.exe" + export portwine_exe="$WINEPREFIX/drive_c/users/steamuser/AppData/Local/Wosb Launcher/launcher.exe" + pw_create_unique_exe "wosb_launcher_pp" + kill_portwine pw_stop_progress_bar - - export PW_NO_RESTART_PPDB="1" - if [[ "$LANGUAGE" == "ru" ]] ; then - export PORTWINE_CREATE_SHORTCUT_NAME="World of Sea Battle RU" - pw_create_unique_exe "wosb_launcher_ru" - try_remove_file "${portwine_exe}.ppdb" - export PW_SKIP_RESTART_STEAM=1 - portwine_create_shortcut block_name - fi - - export PORTWINE_CREATE_SHORTCUT_NAME="World of Sea Battle EN" - pw_create_unique_exe "wosb_launcher_en" - try_remove_file "${portwine_exe}.ppdb" - portwine_create_shortcut block_name - + portwine_create_shortcut fi stop_portwine diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 6c48e7f..463689c 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -30,25 +30,26 @@ export orig_IFS="$IFS" MISSING_DESKTOP_FILE="0" unset PW_NO_RESTART_PPDB PW_DISABLED_CREATE_DB + if [[ "$1" == *.[Pp][Pp][Aa][Cc][Kk] ]] ; then export PW_NO_RESTART_PPDB="1" export PW_DISABLED_CREATE_DB="1" portwine_exe="$1" elif [[ -f "$1" ]] ; then - portwine_exe="$(realpath "$1")" + portwine_exe="$(realpath -s "$1")" elif [[ -f "$OLDPWD/$1" ]] \ && [[ "$1" == *.[Ee][Xx][Ee] || "$1" == *.[Bb][Aa][Tt] || "$1" == *.[Rr][Ee][Gg] || "$1" == *.[Mm][Ss][Ii] ]] then - portwine_exe="$(realpath "$OLDPWD/$1")" + portwine_exe="$(realpath -s "$OLDPWD/$1")" elif [[ "$1" == "--debug" ]] \ && [[ -f "$2" ]] then - portwine_exe="$(realpath "$2")" + portwine_exe="$(realpath -s "$2")" elif [[ "$1" == "--debug" ]] \ && [[ -f "$OLDPWD/$2" ]] \ && [[ "$2" == *.[Ee][Xx][Ee] || "$2" == *.[Bb][Aa][Tt] || "$2" == *.[Rr][Ee][Gg] || "$2" == *.[Mm][Ss][Ii] ]] then - portwine_exe="$(realpath "$OLDPWD/$2")" + portwine_exe="$(realpath -s "$OLDPWD/$2")" elif [[ "$1" == *.[Ee][Xx][Ee] || "$1" == *.[Bb][Aa][Tt] || "$1" == *.[Mm][Ss][Ii] || "$1" == *.[Rr][Ee][Gg] ]] then portwine_exe="$1" @@ -714,7 +715,7 @@ else --field=" EVE Online Launcher"!"$PW_GUI_ICON_PATH/eve.png"!"":"FBTN" '@bash -c "button_click --normal PW_EVE"' \ --field=" Rockstar Games Launcher"!"$PW_GUI_ICON_PATH/Rockstar.png"!"":"FBTN" '@bash -c "button_click --normal PW_ROCKSTAR"' \ --field=" Gameforge Client"!"$PW_GUI_ICON_PATH/gameforge.png"!"":"FBTN" '@bash -c "button_click --normal PW_GAMEFORGE"' \ - --field=" World of Sea Battle (x64)"!"$PW_GUI_ICON_PATH/wosb.png"!"":"FBTN" '@bash -c "button_click --normal PW_WOSB"' \ + --field=" World of Sea Battle"!"$PW_GUI_ICON_PATH/wosb.png"!"":"FBTN" '@bash -c "button_click --normal PW_WORLD_OF_SEA_BATTLE"' \ --field=" CALIBER"!"$PW_GUI_ICON_PATH/caliber.png"!"":"FBTN" '@bash -c "button_click --normal PW_CALIBER"' \ --field=" Crossout"!"$PW_GUI_ICON_PATH/crossout.png"!"":"FBTN" '@bash -c "button_click --normal PW_CROSSOUT"' \ --field=" Warframe"!"$PW_GUI_ICON_PATH/warframe.png"!"":"FBTN" '@bash -c "button_click --normal PW_WARFRAME"' \ diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 503ecd2..e84bf58 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -46,7 +46,7 @@ export PW_FAKE_DLSS_VER="230506" export PW_FAKE_DLSS_3_VER="090" export PW_GALLIUM_NINE_VER="0.9" ###WINE_AND_PROTON_LG### -export PW_PROTON_LG_VER="PROTON_LG_9-12" +export PW_PROTON_LG_VER="PROTON_LG_9-15" export PW_WINE_LG_VER="WINE_LG_9-12-2" export PW_WINE_FULLSCREEN_FSR="1" export WINE_FULLSCREEN_FSR_MODE="ultra" From 754a8b804c40b6fe385146dd6a9472139803b868 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Sun, 29 Sep 2024 17:48:50 +0300 Subject: [PATCH 07/22] updated WOSB --- data_from_portwine/changelog_ru | 5 ++--- data_from_portwine/scripts/portwine_db/WorldOfSeaBattle.ppdb | 2 +- .../scripts/pw_autoinstall/PW_WORLD_OF_SEA_BATTLE | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru index 86259db..23c55ea 100755 --- a/data_from_portwine/changelog_ru +++ b/data_from_portwine/changelog_ru @@ -9,9 +9,8 @@ * добавлена автоустановка "Star Conflict" (спасибо Chal55rus) * добавлена автоустановка "Blood and Soul" (спасибо Chal55rus) * обновлена автоустановка "World of Sea Battle" (спасибо valokardin) -* "World of Sea Battle" больше не нужен префикс DOTNET и от - - +* для "World of Sea Battle" исправлено переключение языка в игре и больше не требуется префикс "DOTNET" +* исправлено определение выбора файлов настроек когда exe файл является символьной ссылкой ###Scripts version 2356### / stable / Дата: 28.09.2024 / Размер скачиваемого обновления: 4 мегабайт * исправлена работа в steam и ingame diff --git a/data_from_portwine/scripts/portwine_db/WorldOfSeaBattle.ppdb b/data_from_portwine/scripts/portwine_db/WorldOfSeaBattle.ppdb index c1277df..3177f3b 100644 --- a/data_from_portwine/scripts/portwine_db/WorldOfSeaBattle.ppdb +++ b/data_from_portwine/scripts/portwine_db/WorldOfSeaBattle.ppdb @@ -5,7 +5,7 @@ ################################################ export PW_COMMENT_DB="" export PW_WINDOWS_VER="10" -export PW_VULKAN_USE="1" +export PW_VULKAN_USE="2" export WINEDLLOVERRIDES="vulkan-1=n,b" export PW_NO_ESYNC="1" export PW_USE_D3D_EXTRAS="1" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_WORLD_OF_SEA_BATTLE b/data_from_portwine/scripts/pw_autoinstall/PW_WORLD_OF_SEA_BATTLE index eb20ca9..8a74b84 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_WORLD_OF_SEA_BATTLE +++ b/data_from_portwine/scripts/pw_autoinstall/PW_WORLD_OF_SEA_BATTLE @@ -3,7 +3,7 @@ ######################################################################## export LAUNCH_PARAMETERS=("/S") export PW_PREFIX_NAME="WORLD_OF_SEA_BATTLE" -export PW_VULKAN_USE="1" +export PW_VULKAN_USE="2" export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/installer.exe" export PORTWINE_CREATE_SHORTCUT_NAME="World of Sea Battle" From 7d7ef7496a33d6134315aeb2b4c8e33b10572b54 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Sun, 29 Sep 2024 18:17:18 +0300 Subject: [PATCH 08/22] Scripts version 2357 --- data_from_portwine/changelog_en | 12 ++++++++++++ data_from_portwine/changelog_ru | 2 ++ data_from_portwine/scripts/functions_helper | 1 + data_from_portwine/scripts/start.sh | 2 +- data_from_portwine/scripts/var | 2 +- 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en index 51a262f..19aa976 100755 --- a/data_from_portwine/changelog_en +++ b/data_from_portwine/changelog_en @@ -2,6 +2,18 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2357### / Date: 29.09.2024 / Download update size: 220 megabytes +* updated PROTON_LG to version "9-15" +* updated versions: + * DXVK_GIT "2.4.1-74" + * VKD3D_GIT "1.1-4202" +* added auto-installation "Star Conflict" (thanks to Chal55rus) +* added auto-installation "Blood and Soul" (thanks to Chal55rus) +* updated auto-installation "World of Sea Battle" (thanks valokardin) +* for "World of Sea Battle" language switching in the game has been fixed and the "DOTNET" prefix is ​​no longer required +* fixed determination of the selection of settings files when the exe file is a symbolic link +* added returns to the main menu after canceling the reinstallation/uninstallation of PP, clearing the prefix and uninstalling programs (thanks to Htylol) + ###Scripts version 2356### / stable / Date: 28.09.2024 / Download update size: 4 megabytes * fixed work in steam and ingame diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru index 23c55ea..e875dbc 100755 --- a/data_from_portwine/changelog_ru +++ b/data_from_portwine/changelog_ru @@ -2,6 +2,7 @@ ----------------------------------------- История изменений: +###Scripts version 2357### / Дата: 29.09.2024 / Размер скачиваемого обновления: 220 мегабайт * обновлен PROTON_LG до версии "9-15" * обновлены версии: * DXVK_GIT "2.4.1-74" @@ -11,6 +12,7 @@ * обновлена автоустановка "World of Sea Battle" (спасибо valokardin) * для "World of Sea Battle" исправлено переключение языка в игре и больше не требуется префикс "DOTNET" * исправлено определение выбора файлов настроек когда exe файл является символьной ссылкой +* добавлены возвраты в основное меню после отмены переустановки/удалении PP, чистки префикса и удаления программ (спасибо Htylol) ###Scripts version 2356### / stable / Дата: 28.09.2024 / Размер скачиваемого обновления: 4 мегабайт * исправлена работа в steam и ingame diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 0dde9b6..1a8b32a 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -681,6 +681,7 @@ background_pid () { local arg3=$3 # Номер процесса (1,2,3..) if [[ "$START_FROM_STEAM" == 1 ]] \ + || [[ "$PW_GUI_DISABLED_CS" == 1 ]] \ || [[ -n "$PW_DEBUG" ]] ; then case $arg1 in --start) eval "$arg2" ;; diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 477d815..3267b0e 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -742,7 +742,7 @@ else --field=" Farlight 84"!"$PW_GUI_ICON_PATH/farlight84.png"!"":"FBTN" '@bash -c "button_click --normal PW_FARLIGHT84"' \ --field=" Secret World Legends (ENG)"!"$PW_GUI_ICON_PATH/swl.png"!"":"FBTN" '@bash -c "button_click --normal PW_SWL"' \ --field=" Blood and Soul"!"$PW_GUI_ICON_PATH/bloodandsoul.png"!"":"FBTN" '@bash -c "button_click --normal PW_BLOOD_AND_SOUL"' \ - --field=" Star Conflict (ENG)"!"$PW_GUI_ICON_PATH/starconflict.png"!"":"FBTN" '@bash -c "button_click --normal PW_STAR_CONFLICT"' \ + --field=" Star Conflict"!"$PW_GUI_ICON_PATH/starconflict.png"!"":"FBTN" '@bash -c "button_click --normal PW_STAR_CONFLICT"' \ 2>/dev/null & export START_FROM_PP_GUI="1" diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index e84bf58..5647428 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=2356 +#SCRIPTS_NEXT_VERSION=2357 #SCRIPTS_STABLE_VERSION=2356 ######################################################################## # export PROTON_USE_XALIA="1" From b5448116ae6fb121bb02431ea6fdf6e471b32cca Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Sun, 29 Sep 2024 19:57:20 +0300 Subject: [PATCH 09/22] fixed download for gamescope session --- data_from_portwine/changelog_en | 1 + data_from_portwine/changelog_ru | 1 + data_from_portwine/scripts/functions_helper | 12 ++------ data_from_portwine/scripts/start.sh | 31 ++++++++++++--------- 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en index 19aa976..dd60b32 100755 --- a/data_from_portwine/changelog_en +++ b/data_from_portwine/changelog_en @@ -13,6 +13,7 @@ Changelog: * for "World of Sea Battle" language switching in the game has been fixed and the "DOTNET" prefix is ​​no longer required * fixed determination of the selection of settings files when the exe file is a symbolic link * added returns to the main menu after canceling the reinstallation/uninstallation of PP, clearing the prefix and uninstalling programs (thanks to Htylol) +* fixed launch of games/programs when using disabling the graphical interface (GUI_DISABLED_CS) ###Scripts version 2356### / stable / Date: 28.09.2024 / Download update size: 4 megabytes * fixed work in steam and ingame diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru index e875dbc..5ff3e15 100755 --- a/data_from_portwine/changelog_ru +++ b/data_from_portwine/changelog_ru @@ -13,6 +13,7 @@ * для "World of Sea Battle" исправлено переключение языка в игре и больше не требуется префикс "DOTNET" * исправлено определение выбора файлов настроек когда exe файл является символьной ссылкой * добавлены возвраты в основное меню после отмены переустановки/удалении PP, чистки префикса и удаления программ (спасибо Htylol) +* исправлен запуск игр/программ при использовании отключения графического интерфейса (GUI_DISABLED_CS) ###Scripts version 2356### / stable / Дата: 28.09.2024 / Размер скачиваемого обновления: 4 мегабайт * исправлена работа в steam и ingame diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 1a8b32a..8572019 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -996,22 +996,14 @@ init_wine_ver () { } pw_init_runtime () { - check_flatpak && export PW_USE_RUNTIME="0" - if [[ "$PW_USE_RUNTIME" != "1" ]] \ || [[ "$PW_WINE_USE" == "USE_SYSTEM_WINE" ]] then export PW_LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${PW_PLUGINS_PATH}/portable/lib/lib64:${PW_PLUGINS_PATH}/portable/lib/lib32" export PW_VK_LAYER_PATH="${PW_PLUGINS_PATH}/portable/share/vulkan/implicit_layer.d" - if check_flatpak - then - if check_gamescope_session - then PW_TERM="xterm -fullscreen -bg black -fg white -e" - else PW_TERM="xterm -bg black -fg white -e" - fi - else PW_TERM="env LD_LIBRARY_PATH=\"${PW_LD_LIBRARY_PATH}\" ${PW_PLUGINS_PATH}/portable/bin/xterm -bg black -fg white -e" + if [[ -z "$PW_TERM" ]] ; then + export PW_TERM="env LD_LIBRARY_PATH=\"${PW_LD_LIBRARY_PATH}\" ${PW_PLUGINS_PATH}/portable/bin/xterm -bg black -fg white -e" fi - export PW_TERM export pw_runtime="env" return 0 fi diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 3267b0e..e13ac8b 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -93,7 +93,7 @@ unset PW_PREFIX_NAME WINEPREFIX VULKAN_MOD PW_WINE_VER PW_ADD_TO_ARGS_IN_RUNTIME unset PW_NAME_D_NAME PW_NAME_D_ICON PW_NAME_D_EXEC PW_EXEC_FROM_DESKTOP PW_ALL_DF PW_GENERATE_BUTTONS PW_NAME_D_ICON PW_NAME_D_ICON_48 unset MANGOHUD_CONFIG FPS_LIMIT PW_WINE_USE WINEDLLPATH WINE WINEDIR WINELOADER WINESERVER PW_USE_RUNTIME PORTWINE_CREATE_SHORTCUT_NAME MIRROR unset PW_LOCALE_SELECT PW_SETTINGS_INDICATION PW_GUI_START PW_AUTOINSTALL_EXE NOSTSTDIR RADV_DEBUG PW_NO_AUTO_CREATE_SHORTCUT -unset PW_DESKTOP_FILES_REGEX +unset PW_DESKTOP_FILES_REGEX PW_TERM export PORT_WINE_TMP_PATH="${PORT_WINE_PATH}/data/tmp" rm -f "$PORT_WINE_TMP_PATH"/*{exe,msi,tar}* @@ -263,20 +263,25 @@ fi # create lock file if ! check_flatpak ; then -if [[ -f "${PW_TMPFS_PATH}/portproton.lock" ]] ; then - print_warning "Found lock file: ${PW_TMPFS_PATH}/portproton.lock" - yad_question "${translations[A running PortProton session was detected.\\nDo you want to end the previous session?]}" || exit 0 -fi -touch "${PW_TMPFS_PATH}/portproton.lock" -rm_lock_file () { - echo "Removing the lock file..." - rm -fv "${PW_TMPFS_PATH}/portproton.lock" && echo "OK" -} -trap "rm_lock_file" EXIT + if [[ -f "${PW_TMPFS_PATH}/portproton.lock" ]] ; then + print_warning "Found lock file: ${PW_TMPFS_PATH}/portproton.lock" + yad_question "${translations[A running PortProton session was detected.\\nDo you want to end the previous session?]}" || exit 0 + fi + touch "${PW_TMPFS_PATH}/portproton.lock" + rm_lock_file () { + echo "Removing the lock file..." + rm -fv "${PW_TMPFS_PATH}/portproton.lock" && echo "OK" + } + trap "rm_lock_file" EXIT fi -if check_flatpak -then try_remove_dir "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}" +if check_flatpak ; then + try_remove_dir "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}" + export PW_USE_RUNTIME="0" + if check_gamescope_session + then PW_TERM="xterm -fullscreen -bg black -fg white -e" + else PW_TERM="xterm -bg black -fg white -e" + fi else pw_download_libs fi From 3100f20fe153862809f43bde5e7378352c93e3be Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Sun, 29 Sep 2024 20:22:59 +0300 Subject: [PATCH 10/22] fixed unpack for gamescope session --- data_from_portwine/scripts/functions_helper | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 8572019..7b2d491 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -473,8 +473,9 @@ try_download () { # If gamescope session is active, use PW_TERM for downloading if check_gamescope_session ; then - $PW_TERM curl -f -# -A 'Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)' -H 'Cache-Control: no-cache, no-store' \ - -H 'Pragma: no-cache' -L ${FIRST_URL[@]} -o "$dest" + $PW_TERM "echo "Download $filename from ${FIRST_URL[0]}. Please wait!" \ + ; curl -f -# -A 'Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)' -H 'Cache-Control: no-cache, no-store' \ + -H 'Pragma: no-cache' -L ${FIRST_URL[@]} -o $dest" [[ "$?" != 0 ]] && return 1 || return 0 fi @@ -717,6 +718,13 @@ unpack () { silent) local silent=true ;; esac + + # If gamescope session is active, use PW_TERM for unpack + if check_gamescope_session ; then + $PW_TERM "echo "Unpacking file: $1. Please wait!" ; $command "$1" -C "$2"" + [[ "$?" != 0 ]] && return 1 || return 0 + fi + if [[ "$silent" != "true" ]] ; then set -o pipefail pw_start_progress_bar_cover_block "${COVERS_PATH}/unpacking_${LANGUAGE_GIF}.gif" From 9718f831225b75c8d51418f23f9739c2fa4a2106 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Sun, 29 Sep 2024 21:01:42 +0300 Subject: [PATCH 11/22] more fixes for gamescope session --- data_from_portwine/scripts/functions_helper | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 7b2d491..58a9d18 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -473,9 +473,9 @@ try_download () { # If gamescope session is active, use PW_TERM for downloading if check_gamescope_session ; then - $PW_TERM "echo "Download $filename from ${FIRST_URL[0]}. Please wait!" \ + $PW_TERM "echo ; echo ; echo \"Download $filename from ${FIRST_URL[0]}. Please wait...\" \ ; curl -f -# -A 'Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)' -H 'Cache-Control: no-cache, no-store' \ - -H 'Pragma: no-cache' -L ${FIRST_URL[@]} -o $dest" + -H 'Pragma: no-cache' -L ${FIRST_URL[@]} -o \"$dest\"" [[ "$?" != 0 ]] && return 1 || return 0 fi @@ -721,11 +721,9 @@ unpack () { # If gamescope session is active, use PW_TERM for unpack if check_gamescope_session ; then - $PW_TERM "echo "Unpacking file: $1. Please wait!" ; $command "$1" -C "$2"" + $PW_TERM "echo ; echo ; echo \"Unpacking file: $1. Please wait...\" ; $command -v \"$1\" -C \"$2\"" [[ "$?" != 0 ]] && return 1 || return 0 - fi - - if [[ "$silent" != "true" ]] ; then + elif [[ "$silent" != "true" ]] ; then set -o pipefail pw_start_progress_bar_cover_block "${COVERS_PATH}/unpacking_${LANGUAGE_GIF}.gif" $command "$1" -C "$2" 2>/dev/null From ec42b5fab55c985e2bd3ed686d0b493de70045ad Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Sun, 29 Sep 2024 21:24:44 +0300 Subject: [PATCH 12/22] added support update from gamescope session --- data_from_portwine/scripts/functions_helper | 5 +++-- data_from_portwine/scripts/start.sh | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 58a9d18..135d201 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -473,7 +473,7 @@ try_download () { # If gamescope session is active, use PW_TERM for downloading if check_gamescope_session ; then - $PW_TERM "echo ; echo ; echo \"Download $filename from ${FIRST_URL[0]}. Please wait...\" \ + $PW_TERM "echo ; echo ; echo \"Downloading: $filename. Please wait...\" \ ; curl -f -# -A 'Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)' -H 'Cache-Control: no-cache, no-store' \ -H 'Pragma: no-cache' -L ${FIRST_URL[@]} -o \"$dest\"" [[ "$?" != 0 ]] && return 1 || return 0 @@ -721,7 +721,8 @@ unpack () { # If gamescope session is active, use PW_TERM for unpack if check_gamescope_session ; then - $PW_TERM "echo ; echo ; echo \"Unpacking file: $1. Please wait...\" ; $command -v \"$1\" -C \"$2\"" + yad_info "We wont unpack $1" + $PW_TERM "echo ; echo ; echo \"Unpacking file: $1. Please wait...\" ; $command \"$1\" -C \"$2\"" [[ "$?" != 0 ]] && return 1 || return 0 elif [[ "$silent" != "true" ]] ; then set -o pipefail diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index e13ac8b..d59c84b 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -252,7 +252,9 @@ esac pw_check_and_download_plugins # check skip update -if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] ; then +if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] \ +|| check_gamescope_session +then pw_port_update PW_FILESYSTEM=$(stat -f -c %T "${PORT_WINE_PATH}") From 37d90fc969133b1f84415a97b1d78ada9b3ddfb7 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Sun, 29 Sep 2024 21:56:36 +0300 Subject: [PATCH 13/22] used EN only for gamescope session --- data_from_portwine/scripts/functions_helper | 58 +++++++++++---------- data_from_portwine/scripts/start.sh | 4 +- 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 135d201..ac6136a 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -71,39 +71,44 @@ change_locale () { fi fi - [[ ! -f "${pw_yad}" ]] && pw_yad="yad" + local GAME_LANGUAGE="$LANGUAGE" - if [[ -z "$LANGUAGE" ]] \ - || [[ "${PW_FORCE_CHANGE_LOC}" == "1" ]] ; then - SET_LANG=( - "${pw_yad}" --list - --window-icon="$PW_GUI_ICON_PATH/portproton.svg" - --title="Select language for PortProton" - --column="Language" --column="" - --width=400 --height=200 + if check_gamescope_session ; then + LANGUAGE="en" + else + [[ ! -f "${pw_yad}" ]] && pw_yad="yad" + if [[ -z "$LANGUAGE" ]] \ + || [[ "${PW_FORCE_CHANGE_LOC}" == "1" ]] ; then + SET_LANG=( + "${pw_yad}" --list + --window-icon="$PW_GUI_ICON_PATH/portproton.svg" + --title="Select language for PortProton" + --column="Language" --column="" + --width=400 --height=200 - "Russian (Русский)" ru - "English" en - "Spanish (Español・Española)" es - ) + "Russian (Русский)" ru + "English" en + "Spanish (Español・Española)" es + ) - out=$("${SET_LANG[@]}") - if [[ -z $out ]] \ - && [[ -n "$LANGUAGE" ]] ; then - echo "${LANGUAGE}" > "${PORT_WINE_TMP_PATH}/PortProton_loc" - elif [[ -z $out ]] ; then - echo "en" > "${PORT_WINE_TMP_PATH}/PortProton_loc" - else - LANGUAGE=$(echo "$out" | cut -d '|' -f2) - echo "${LANGUAGE}" > "${PORT_WINE_TMP_PATH}/PortProton_loc" - create_translations + out=$("${SET_LANG[@]}") + if [[ -z $out ]] \ + && [[ -n "$LANGUAGE" ]] ; then + echo "${LANGUAGE}" > "${PORT_WINE_TMP_PATH}/PortProton_loc" + elif [[ -z $out ]] ; then + echo "en" > "${PORT_WINE_TMP_PATH}/PortProton_loc" + else + LANGUAGE=$(echo "$out" | cut -d '|' -f2) + echo "${LANGUAGE}" > "${PORT_WINE_TMP_PATH}/PortProton_loc" + create_translations + fi + unset PW_FORCE_CHANGE_LOC + restart_pp fi - unset PW_FORCE_CHANGE_LOC - restart_pp fi export LANGUAGE - case "$LANGUAGE" in + case "$GAME_LANGUAGE" in ru) check_start_from_steam && export LC_ALL=ru_RU.UTF-8 export FULL_LN="russian" @@ -721,7 +726,6 @@ unpack () { # If gamescope session is active, use PW_TERM for unpack if check_gamescope_session ; then - yad_info "We wont unpack $1" $PW_TERM "echo ; echo ; echo \"Unpacking file: $1. Please wait...\" ; $command \"$1\" -C \"$2\"" [[ "$?" != 0 ]] && return 1 || return 0 elif [[ "$silent" != "true" ]] ; then diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index d59c84b..e13ac8b 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -252,9 +252,7 @@ esac pw_check_and_download_plugins # check skip update -if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] \ -|| check_gamescope_session -then +if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] ; then pw_port_update PW_FILESYSTEM=$(stat -f -c %T "${PORT_WINE_PATH}") From 1f29138f86701fe9c49694eb33eb57b59cf4364c Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Mon, 30 Sep 2024 11:01:38 +0300 Subject: [PATCH 14/22] added fix changelog for gamescope session --- data_from_portwine/scripts/functions_helper | 6 +++--- data_from_portwine/scripts/start.sh | 12 ++++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index ac6136a..343f92e 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -1893,12 +1893,12 @@ pw_port_update () { else curl -s --list-only "${URL_FOR_CHANGELOG}/${PW_CHANGELOG_FILE}" | tee "${PORT_WINE_TMP_PATH}/curent_var_ver" CHANGLOG_NEWS=$(sed "/Scripts version ${scripts_install_ver}/,$ d" "${PORT_WINE_TMP_PATH}/curent_var_ver" | sed '1,/---/ d' ) - xcsd=$("${pw_yad}" --title "${translations[Update scripts:]} v.(${scripts_install_ver}${BRANCH_VERSION})" --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ + "${pw_yad}" --title "${translations[Update scripts:]} v.(${scripts_install_ver}${BRANCH_VERSION})" --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ --form --separator='%%%' --width=1000 --height=500 \ - --field=":TXT" "${CHANGLOG_NEWS}" \ + --field=":TXT" "$(print_wrapped "${CHANGLOG_NEWS}" 100)" \ --button="${translations[DO NOT REMIND ME]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":16 \ --button="${translations[REMIND ME LATER]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":18 \ - --button="${translations[UPDATING NOW]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":20 2>/dev/null) + --button="${translations[UPDATING NOW]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":20 2>/dev/null YAD_STATUS="$?" # --button="${translations[EXIT]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":252 \ diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index e13ac8b..50bb906 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -251,6 +251,13 @@ esac pw_check_and_download_plugins +if check_flatpak ; then + if check_gamescope_session + then PW_TERM="xterm -fullscreen -bg black -fg white -e" + else PW_TERM="xterm -bg black -fg white -e" + fi +fi + # check skip update if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] ; then pw_port_update @@ -278,10 +285,6 @@ fi if check_flatpak ; then try_remove_dir "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}" export PW_USE_RUNTIME="0" - if check_gamescope_session - then PW_TERM="xterm -fullscreen -bg black -fg white -e" - else PW_TERM="xterm -bg black -fg white -e" - fi else pw_download_libs fi @@ -294,6 +297,7 @@ then fi pw_check_and_download_dxvk_and_vkd3d + # shellcheck source=/dev/null source "${USER_CONF}" From 1d26ddec57ee66b159f5094422dcffd3f6932b06 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Mon, 30 Sep 2024 11:09:49 +0300 Subject: [PATCH 15/22] updated changeloge_en for gamescope session --- data_from_portwine/changelog_en | 27 ++++++++++++++------- data_from_portwine/scripts/functions_helper | 2 +- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en index dd60b32..72c5afe 100755 --- a/data_from_portwine/changelog_en +++ b/data_from_portwine/changelog_en @@ -10,9 +10,11 @@ Changelog: * added auto-installation "Star Conflict" (thanks to Chal55rus) * added auto-installation "Blood and Soul" (thanks to Chal55rus) * updated auto-installation "World of Sea Battle" (thanks valokardin) -* for "World of Sea Battle" language switching in the game has been fixed and the "DOTNET" prefix is ​​no longer required +* for "World of Sea Battle" language switching in the game has been fixed and the +"DOTNET" prefix is ​​no longer required * fixed determination of the selection of settings files when the exe file is a symbolic link -* added returns to the main menu after canceling the reinstallation/uninstallation of PP, clearing the prefix and uninstalling programs (thanks to Htylol) +* added returns to the main menu after canceling the reinstallation/uninstallation of PP, +clearing the prefix and uninstalling programs (thanks to Htylol) * fixed launch of games/programs when using disabling the graphical interface (GUI_DISABLED_CS) ###Scripts version 2356### / stable / Date: 28.09.2024 / Download update size: 4 megabytes @@ -49,11 +51,14 @@ Changelog: * updated versions: * DXVK_GIT "2.4-94" * VKD3D_GIT "1.1-4191" -* added a translation cache, which greatly improves the responsiveness of the interface (thanks to Htylol) +* added a translation cache, which greatly improves the responsiveness +of the interface (thanks to Htylol) * fixed launching shortcuts from special. symbols in the title (thanks to Htylol) -* limited number of characters for shortcut names in the "installed" tab (fixes overly wide menu) (thanks to Htylol) +* limited number of characters for shortcut names in the "installed" +tab (fixes overly wide menu) (thanks to Htylol) * disabled decoration for HoYoPlay launcher (fixes window capacity) (thanks to Boria138) -* Crossout installation has been moved to a separate prefix and decoration for the launcher has been disabled (corrects the capacity in the window) +* Crossout installation has been moved to a separate prefix and decoration +for the launcher has been disabled (corrects the capacity in the window) ###Scripts version 2349### / Date: 18.09.2024 / Download update size: 4 megabytes * fixed video driver path forwarding for future versions of ALT Linux (p11) @@ -81,8 +86,10 @@ Changelog: * added reset settings for mangohud and vkbasalt * fixed mangohud preview if it is disabled * user.conf settings have been moved from the editdb settings and portproton settings, - * a separate graphical interface has been made for user.conf, with the ability to launch settings from the main menu and when starting a game/program - * added return to the main menu after creating a backup, winetricks, wine download, etc., and added return to the last active tabs + * a separate graphical interface has been made for user.conf, with the ability to + launch settings from the main menu and when starting a game/program + * added return to the main menu after creating a backup, winetricks, wine download, + etc., and added return to the last active tabs * added intermediate returns (to the previous active window) * updated translations (Spanish, Russian) * added the ability to open the game/program directory from the settings tab @@ -106,7 +113,8 @@ Changelog: * HoYoPlay auto-installation updated (thanks Eljeyna) ###Scripts version 2340### / Date: 27.08.2024 / Download update size: 380 megabytes -* added the ability for standard installation to the prefix manager (without forced redownload of components) +* added the ability for standard installation to the prefix manager +(without forced redownload of components) * updated PROTON_LG to version "9-11" * updated WINE_LG to version "9-12-2" * the test WINE_LG_NTSYNC has been updated in the repositories to version "9-13-2" @@ -126,7 +134,8 @@ Changelog: * added the ability to run .reg files (thanks Boria138) * added icons for msi, bat and reg files (thanks to Dervart) * fixed GUI alignment for XFCE (thanks to Htylol) -* added automatic disabling of downloading covers for STEAM if there is no access to the covers server +* added automatic disabling of downloading covers for STEAM if there +is no access to the covers server ###Scripts version 2337### / Date: 09.08.2024 / Download update size: 4 megabytes * fixed GUI alignment on SteamDeck (thanks to Htylol) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 343f92e..47ca78c 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -1895,7 +1895,7 @@ pw_port_update () { CHANGLOG_NEWS=$(sed "/Scripts version ${scripts_install_ver}/,$ d" "${PORT_WINE_TMP_PATH}/curent_var_ver" | sed '1,/---/ d' ) "${pw_yad}" --title "${translations[Update scripts:]} v.(${scripts_install_ver}${BRANCH_VERSION})" --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ --form --separator='%%%' --width=1000 --height=500 \ - --field=":TXT" "$(print_wrapped "${CHANGLOG_NEWS}" 100)" \ + --field=":TXT" "${CHANGLOG_NEWS}" \ --button="${translations[DO NOT REMIND ME]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":16 \ --button="${translations[REMIND ME LATER]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":18 \ --button="${translations[UPDATING NOW]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":20 2>/dev/null From ba777a2c28101ee6e81780f929dae14201d81174 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Mon, 30 Sep 2024 11:15:18 +0300 Subject: [PATCH 16/22] added fix download plugins for gamescope session --- data_from_portwine/scripts/start.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 50bb906..f5e4647 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -249,8 +249,6 @@ case "$PW_GUI_START" in ;; esac -pw_check_and_download_plugins - if check_flatpak ; then if check_gamescope_session then PW_TERM="xterm -fullscreen -bg black -fg white -e" @@ -258,6 +256,8 @@ if check_flatpak ; then fi fi +pw_check_and_download_plugins + # check skip update if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] ; then pw_port_update From a86d6e7e91ab77464b669ea43555a52e2d87db49 Mon Sep 17 00:00:00 2001 From: Sergey Palcheh Date: Mon, 30 Sep 2024 14:32:05 +0600 Subject: [PATCH 17/22] Added game GameXP --- data_from_portwine/img/gui/gamexp.png | Bin 0 -> 3709 bytes .../scripts/pw_autoinstall/PW_GAME_XP | 22 ++++++++++++++++++ data_from_portwine/scripts/start.sh | 1 + 3 files changed, 23 insertions(+) create mode 100644 data_from_portwine/img/gui/gamexp.png create mode 100755 data_from_portwine/scripts/pw_autoinstall/PW_GAME_XP diff --git a/data_from_portwine/img/gui/gamexp.png b/data_from_portwine/img/gui/gamexp.png new file mode 100644 index 0000000000000000000000000000000000000000..115cb19cf54d00ee40f2314df4ce620720d3ba13 GIT binary patch literal 3709 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 b/dev/null & export START_FROM_PP_GUI="1" From 7369c200a3d5a1c4a932ee1b31330d68f00eb5c5 Mon Sep 17 00:00:00 2001 From: Sergey Palcheh Date: Mon, 30 Sep 2024 14:34:35 +0600 Subject: [PATCH 18/22] Added game Lost Light --- data_from_portwine/img/gui/lostlight.png | Bin 0 -> 6450 bytes .../scripts/pw_autoinstall/PW_LOST_LIGHT | 20 ++++++++++++++++++ data_from_portwine/scripts/start.sh | 1 + 3 files changed, 21 insertions(+) create mode 100644 data_from_portwine/img/gui/lostlight.png create mode 100755 data_from_portwine/scripts/pw_autoinstall/PW_LOST_LIGHT diff --git a/data_from_portwine/img/gui/lostlight.png b/data_from_portwine/img/gui/lostlight.png new file mode 100644 index 0000000000000000000000000000000000000000..39168c04a131d375ffc69d8cbc1a465c59995b74 GIT binary patch literal 6450 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 M07*qoM6N<$f&({UU;qFB literal 0 HcmV?d00001 diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_LOST_LIGHT b/data_from_portwine/scripts/pw_autoinstall/PW_LOST_LIGHT new file mode 100755 index 0000000..0de27f6 --- /dev/null +++ b/data_from_portwine/scripts/pw_autoinstall/PW_LOST_LIGHT @@ -0,0 +1,20 @@ +#!/usr/bin/env bash +# Author: chal55rus +######################################################################## +export PW_PREFIX_NAME="LOST_LIGHT" +export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/LostLight.exe" +export PORTWINE_CREATE_SHORTCUT_NAME="Lost Light" + +start_portwine +if try_download "https://h75na.gdl.easebar.com/LostLight_global_netease_20240903.exe" "${PW_AUTOINSTALL_EXE}" no_mirror +then + pw_start_progress_bar_install_game "LostLight." + "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)/LostLight" + portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/LostLight/launcher.exe" + try_remove_file "${PW_AUTOINSTALL_EXE}" + try_remove_file "${portwine_exe}.ppdb" + kill_portwine + pw_stop_progress_bar + portwine_create_shortcut +fi +stop_portwine diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 078712a..7ea1881 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -753,6 +753,7 @@ else --field=" Blood and Soul"!"$PW_GUI_ICON_PATH/bloodandsoul.png"!"":"FBTN" '@bash -c "button_click --normal PW_BLOOD_AND_SOUL"' \ --field=" Star Conflict"!"$PW_GUI_ICON_PATH/starconflict.png"!"":"FBTN" '@bash -c "button_click --normal PW_STAR_CONFLICT"' \ --field=" GameXP"!"$PW_GUI_ICON_PATH/gamexp.png"!"":"FBTN" '@bash -c "button_click --normal PW_GAME_XP"' \ + --field=" Lost Light"!"$PW_GUI_ICON_PATH/lostlight.png"!"":"FBTN" '@bash -c "button_click --normal PW_LOST_LIGHT"' \ 2>/dev/null & export START_FROM_PP_GUI="1" From d1a553a46f0012ec1157483f1783138e208b26e8 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Mon, 30 Sep 2024 11:40:56 +0300 Subject: [PATCH 19/22] #2 updated changeloge_en for gamescope session --- data_from_portwine/changelog_en | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en index 72c5afe..04897ca 100755 --- a/data_from_portwine/changelog_en +++ b/data_from_portwine/changelog_en @@ -24,7 +24,7 @@ clearing the prefix and uninstalling programs (thanks to Htylol) * cumulative update to the stable version of PortProton scripts ###Scripts version 2354### / Date: 28.09.2024 / Download update size: 4 megabytes -* added return to PortProton menu after using winecfg, winereg, winecmd and winefile (thanks Htylol) +* added return to PortProton menu after using winecfg, winereg, winecmd, winefile (thanks Htylol) ###Scripts version 2353### / Date: 27.09.2024 / Download update size: 4 megabytes * optimized auto-installation functions for all games/launchers @@ -85,10 +85,10 @@ for the launcher has been disabled (corrects the capacity in the window) * many thanks to Htylol for this update, everything listed below is his merit :) * added reset settings for mangohud and vkbasalt * fixed mangohud preview if it is disabled - * user.conf settings have been moved from the editdb settings and portproton settings, - * a separate graphical interface has been made for user.conf, with the ability to + * user.conf settings have been moved from the editdb settings and portproton settings, + * a separate graphical interface has been made for user.conf, with the ability to launch settings from the main menu and when starting a game/program - * added return to the main menu after creating a backup, winetricks, wine download, + * added return to the main menu after creating a backup, winetricks, wine download, etc., and added return to the last active tabs * added intermediate returns (to the previous active window) * updated translations (Spanish, Russian) From ad3defa164eb588c9b07ce1d044648681bc00066 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Mon, 30 Sep 2024 12:58:01 +0300 Subject: [PATCH 20/22] changeloge to text-info for gamescope session --- data_from_portwine/changelog_en | 18 ++++++------------ data_from_portwine/scripts/functions_helper | 12 ++++++------ 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en index 04897ca..6b2859b 100755 --- a/data_from_portwine/changelog_en +++ b/data_from_portwine/changelog_en @@ -10,11 +10,9 @@ Changelog: * added auto-installation "Star Conflict" (thanks to Chal55rus) * added auto-installation "Blood and Soul" (thanks to Chal55rus) * updated auto-installation "World of Sea Battle" (thanks valokardin) -* for "World of Sea Battle" language switching in the game has been fixed and the -"DOTNET" prefix is ​​no longer required +* for "World of Sea Battle" language switching in the game has been fixed and the "DOTNET" prefix is ​​no longer required * fixed determination of the selection of settings files when the exe file is a symbolic link -* added returns to the main menu after canceling the reinstallation/uninstallation of PP, -clearing the prefix and uninstalling programs (thanks to Htylol) +* added returns to the main menu after canceling the reinstallation/uninstallation of PP, clearing the prefix and uninstalling programs (thanks to Htylol) * fixed launch of games/programs when using disabling the graphical interface (GUI_DISABLED_CS) ###Scripts version 2356### / stable / Date: 28.09.2024 / Download update size: 4 megabytes @@ -54,11 +52,9 @@ clearing the prefix and uninstalling programs (thanks to Htylol) * added a translation cache, which greatly improves the responsiveness of the interface (thanks to Htylol) * fixed launching shortcuts from special. symbols in the title (thanks to Htylol) -* limited number of characters for shortcut names in the "installed" -tab (fixes overly wide menu) (thanks to Htylol) +* limited number of characters for shortcut names in the "installed" tab (fixes overly wide menu) (thanks to Htylol) * disabled decoration for HoYoPlay launcher (fixes window capacity) (thanks to Boria138) -* Crossout installation has been moved to a separate prefix and decoration -for the launcher has been disabled (corrects the capacity in the window) +* Crossout installation has been moved to a separate prefix and decoration for the launcher has been disabled (corrects the capacity in the window) ###Scripts version 2349### / Date: 18.09.2024 / Download update size: 4 megabytes * fixed video driver path forwarding for future versions of ALT Linux (p11) @@ -86,10 +82,8 @@ for the launcher has been disabled (corrects the capacity in the window) * added reset settings for mangohud and vkbasalt * fixed mangohud preview if it is disabled * user.conf settings have been moved from the editdb settings and portproton settings, - * a separate graphical interface has been made for user.conf, with the ability to - launch settings from the main menu and when starting a game/program - * added return to the main menu after creating a backup, winetricks, wine download, - etc., and added return to the last active tabs + * a separate graphical interface has been made for user.conf, with the ability to launch settings from the main menu and when starting a game/program + * added return to the main menu after creating a backup, winetricks, wine download, etc., and added return to the last active tabs * added intermediate returns (to the previous active window) * updated translations (Spanish, Russian) * added the ability to open the game/program directory from the settings tab diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 47ca78c..955bbae 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -1891,14 +1891,14 @@ pw_port_update () { xcsd="${translations[UPDATING NOW]}" unset PW_CHANGE_BRANCH else - curl -s --list-only "${URL_FOR_CHANGELOG}/${PW_CHANGELOG_FILE}" | tee "${PORT_WINE_TMP_PATH}/curent_var_ver" - CHANGLOG_NEWS=$(sed "/Scripts version ${scripts_install_ver}/,$ d" "${PORT_WINE_TMP_PATH}/curent_var_ver" | sed '1,/---/ d' ) - "${pw_yad}" --title "${translations[Update scripts:]} v.(${scripts_install_ver}${BRANCH_VERSION})" --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ - --form --separator='%%%' --width=1000 --height=500 \ - --field=":TXT" "${CHANGLOG_NEWS}" \ + curl -s --list-only "${URL_FOR_CHANGELOG}/${PW_CHANGELOG_FILE}" > "${PORT_WINE_TMP_PATH}/curent_var_ver" + sed -i "/Scripts version ${scripts_install_ver}/,$ d" "${PORT_WINE_TMP_PATH}/curent_var_ver" + + "${pw_yad}" --title "${translations[Update scripts:]} v.(${scripts_install_ver}${BRANCH_VERSION})" \ + --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --width=1280 --height=720 --text-info --wrap --scroll \ --button="${translations[DO NOT REMIND ME]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":16 \ --button="${translations[REMIND ME LATER]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":18 \ - --button="${translations[UPDATING NOW]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":20 2>/dev/null + --button="${translations[UPDATING NOW]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":20 < "${PORT_WINE_TMP_PATH}/curent_var_ver" 2>/dev/null YAD_STATUS="$?" # --button="${translations[EXIT]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":252 \ From f612bdca3241e28aed1a927824b4e5c345069f79 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Mon, 30 Sep 2024 13:37:45 +0300 Subject: [PATCH 21/22] Scripts version 2358 --- data_from_portwine/changelog_en | 7 +++++++ data_from_portwine/changelog_ru | 7 +++++++ data_from_portwine/img/gui/swl.png | Bin 3410 -> 5097 bytes .../scripts/pw_autoinstall/PW_LOST_LIGHT | 9 ++++++--- data_from_portwine/scripts/var | 2 +- 5 files changed, 21 insertions(+), 4 deletions(-) mode change 100755 => 100644 data_from_portwine/img/gui/swl.png diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en index 6b2859b..4ad9b2c 100755 --- a/data_from_portwine/changelog_en +++ b/data_from_portwine/changelog_en @@ -2,6 +2,13 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2358### / Date: 30.09.2024 / Download update size: 4 megabytes +* added for game mode on Steam Deck: + * possibility to update PortProton + * displaying the process of downloading and unpacking all PortProton packages +* added auto-installation "Lost Light" (thanks Chal55rus) +* added auto-installation "GameXP" (thanks Chal55rus) + ###Scripts version 2357### / Date: 29.09.2024 / Download update size: 220 megabytes * updated PROTON_LG to version "9-15" * updated versions: diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru index 5ff3e15..03f6278 100755 --- a/data_from_portwine/changelog_ru +++ b/data_from_portwine/changelog_ru @@ -2,6 +2,13 @@ ----------------------------------------- История изменений: +###Scripts version 2358### / Дата: 30.09.2024 / Размер скачиваемого обновления: 4 мегабайт +* добавлены для игрового режима на Steam Deck: + * возможность обновления PortProton + * отображение процесса скачивания и распаковки всех пакетов PortProton +* добавлена автоустановка "Lost Light" (спасибо Chal55rus) +* добавлена автоустановка "GameXP" (спасибо Chal55rus) + ###Scripts version 2357### / Дата: 29.09.2024 / Размер скачиваемого обновления: 220 мегабайт * обновлен PROTON_LG до версии "9-15" * обновлены версии: diff --git a/data_from_portwine/img/gui/swl.png b/data_from_portwine/img/gui/swl.png old mode 100755 new mode 100644 index 531088cfce011d14b0d5a2b83c6aefc89f26721c..0a169a5ed87a136d22aeba7e48d325688a4ebed5 GIT binary patch literal 5097 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 LNkvXXu0mjfO-AU2 delta 3408 zcmV-W4X^U)C(;^_BYy#JX+uL$X=7sm04R}lk-bYoQ5eR5YGITSQA0$7gGPfw6jWo` z;36Srkkz6$KLS54_bMT+K}&%b6YHkjod1NHE}Dj;*+zZ@3tspJ}{t&D7_@;eQZq$M*v^Rqy?(SNnY} zN6&iF)WFsyJf-PIQFvB3v{}>@?+OoUnfSW!v9QmO0}9_LJyGLV#pxP1>gQ26aV7Ihi&BSWj$jfYNB}npN^Fp&h+k@6GHdM{|MM+S z5RWE*oic_v(tl*c>l3vkU6WE%q9^6cQdYVD&(lmzPSm=)0?_$lSsz|-?m@L;SwAP1 zRXqjAGhF2x{(|H*^Cfzvp?Qv=ZyPSI8(Lx?E_Yz)Nsk-xKgl7}o=U;{IrPS0;10T1 zYgyITIeUcYmORld92~-^?C)Fq1w77ZCatG$9{>OV34d@%S#tmY3labT3lag+-G2N4 z01JspL_t(&1?`x7Y*cj?$IrZ{?+$IDLc!J+3bY_E6{yG}U5SsHK;o|JGwQAyqG;mk zsvERwjJR2RWV0q_jjy;yL|4SP>}so`Aa4o^jb2^VZGj~7dPABUcI@dq^ zZ~IGr^MAYZyZ8R?_nh-R-`}}cWVj7`VAuo09vJq(|FZ`iKf(CISu-wsX;JO`I*-fc zGace^IGo~eI)x+A1*~Ho`ERu!kI7jP(@Y*QT1PtSoQ{cv)mg)g#$w@hpM3t_&Ze*K zka#ovW~V#D@yN5!f3S7Oh9&0$o| zR%b_i)9345`9+1|_ISnZ^&~;NFu;ug9uIR~@%jDY$3QjA1Uk_YHN?$-ZAKJ;k%+{j zNq?|O&<6jbfH%b8Tr3imuG1YdyY}+ZY*1W9&?r6m9>F99fj|fP1PL6nd zKJfrnL24v)^bJO(v$t0c9X>3lySpU>pg2@=LA6Y-FUrrCap#>U#f60yWx}BlU@=Co zBN{P`Fv4Mp(i1Vm(bL}Ha>rw7!Rtv|1Ahj3dK?nS6sLkobwDXF^{yJz+SVpbEiDov z5+xNCQeIOdCF90f1}o6E6DQ=vv18Ks?YH9M|1_?dP+BTZcyG`hbYZ=OuE{g>S%Og! z9AejO4G8!2NNgZa9Pn5l^X2i7G89bWD-$LU|l!0Hu50xfdPs1{R{?#@IsWu9C1_vuV`1=bai#fzqfCf z>2-Co{O-HuEdM|H@IyJYZ=dvGv^J$!-iQ%WHh#R!y7*!lHFBiPpFdyb5~0;^zb&h{ z{;HWXr7$ngT35ZU-9fVJGb6oy)_*$be(WO<42r>GrqeA6cQq^=e7PLse=#{y3eU#}0^-B7F@SWQIU~E8o8{A0tE2+3zq#cWDZr>37)OsCEAOma zDRnbuNFY1gT0cQfm@y29Mr5F)BOP|@oXhTt>cUa=75O=mfR^k7k|5L@_kZk>tM9*G zyntNEI0moPL5JCsC(Fp(T=8hGaGiph1W279Px2nxxl>ku@PU*}m>|W)#Zp>UCVuAE zVq7_+lXVPe7F9($bxL+0Ix746d!9&#(cXYSVf}avP+9ch{ewr3$^}r7-QyCRY@j!^TwNRN(n}d9z9wv zC@+`Rvu9<`mtRU5Mns8nn5Y@YTcx=tDEouGX$`QYkV>5Dv(xF4ZXT3@=lpnn+bgfg zHGtQ|Ue(Yb=K1H#g4=JGDbS$^u6r>y%zY>En?(*FbAZi(HK>w@Ald5_1WF1~^C&{Pd_3-J_^4YFkvheDw z#YZ%wT>JGq@5ngr3x7p)FNn$hzK|Ro=t~;`TLUKgGV3d{{9>}}`gu?SwaI5xh#zA} z9iIHvjW=4LgLw9zYuCzqufHx0D9lE@8U#o=DwK!!FF|HMX>1f{d%H|7DUl7EH%k!_ zDdBh|eI2<_U`5+$?al}K!_pE;Z$Q#j>aHQ0?vznf#{hVuuYXVcM8U_ko8Wf!b=S$Y zix*pW?!~jqmMoFRC!dtu9Xq7#$PvjWC)Patu>9f9JEaS0&Cbk}>3Dnt*9z)ZNu(N9 zueOT70;IHr{h|$;q8C=Q2TQ*pkR_*W4baPUqe$E|{{cF`iqLWNpzKnamNj*}SD_*YC@Gq$hdQAN zHIxM5dTnW`d`A+03*|IN3M(t+FiMk+7#N+M($2No3V%k8k`U|1se$79%%8&mRf6PV z?8Gb>gVUYNO_?*t`me=X8_78pb=rIAkVHt>B4}~~2~FV5knZB#Q$XKG!s{ASxwl)_ zWuwz;`UYzrt*hcGhgsl%h6t$VwrED%j!}SH`0GnC{AU*K86)@9C=so-Q zTR@@!G=BiDJF-F7Xeqx<#yHo9prt^gtgI|%Ned{d5mwLZbCpVV&7MN6VA01+zA-5n z%22CR(8WXj{mH5lpelvg?8ME`s0UsvSe4Z85rJ0qycTtU4?;ILj_AW+2QpiXG;3>b zZM6hKaa%@Mv*~|+ngOh#q1CRS;yic&710(bDt{79LG_g;c|U6PTa>7Q2L-lIBd1 zn+(0g|<+6mVdK} zT|r`2QpgpfQqz&iUtq{MHovdfp@Wp(f2QtH@al{|-E)tWv#!3KS<*WA%%8v@v8{zl zy&3i6yva`_Zq&zmUuES&xcW5_@RXIwB+6v1@8?{5t!#zMn<>&d*r0UJP$_LE;rEcR zEdZPg*yZHO2n-5y{*QOuAqMMIV}G!|2gHb+-lJ9Ukw{EhqoF6TXUJxo#CoSjz)22h zQfb#{XsGAF`PTuY99|5c%P1XQBoa+*SerllOxoDk^lL*gmFuPC!Q2H4WGocZc9I-< zdg)Rb;JQmF#r3m_wLa%k&#^AF`AN$!y?1{02(u=~D=x3k$^joyus&LGPJfN)g|C~S z)4XNNRcU2eP{G=9^{q<(FHZRlF#QMk~l>r*CCD zd9m3{x!v2;B$MI)NNA)q(|@LdsrjXA4JegJ;*G(WYzlUz#hCV_E_`WLATcAu>2UEy zPF2VYVD-G-s77eGb=0VIphCyksGDswmn!G2eaC)zL{zxp*an=aFk#4Qw mbHg4O_Q0?QhCMLsf&T#7yak>UyccW$0000 Date: Mon, 30 Sep 2024 13:40:09 +0300 Subject: [PATCH 22/22] STABLE: Scripts version 2359 --- data_from_portwine/changelog_en | 3 +++ data_from_portwine/changelog_ru | 3 +++ data_from_portwine/scripts/var | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en index 4ad9b2c..1220f5a 100755 --- a/data_from_portwine/changelog_en +++ b/data_from_portwine/changelog_en @@ -2,6 +2,9 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2359### / stable / Date: 30.09.2024 / Download update size: 220 megabytes +* cumulative update to the stable version of PortProton scripts + ###Scripts version 2358### / Date: 30.09.2024 / Download update size: 4 megabytes * added for game mode on Steam Deck: * possibility to update PortProton diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru index 03f6278..c618735 100755 --- a/data_from_portwine/changelog_ru +++ b/data_from_portwine/changelog_ru @@ -2,6 +2,9 @@ ----------------------------------------- История изменений: +###Scripts version 2359### / stable / Дата: 30.09.2024 / Размер скачиваемого обновления: 220 мегабайт +* кумулятивное обновление стабильной версии скриптов PortProton + ###Scripts version 2358### / Дата: 30.09.2024 / Размер скачиваемого обновления: 4 мегабайт * добавлены для игрового режима на Steam Deck: * возможность обновления PortProton diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 13e68e1..891fecf 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,7 +1,7 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2358 -#SCRIPTS_STABLE_VERSION=2356 +#SCRIPTS_NEXT_VERSION=2359 +#SCRIPTS_STABLE_VERSION=2359 ######################################################################## # export PROTON_USE_XALIA="1" export LANGUAGES_LIST="ru es"