From 3659793b044be3c828127ee5f050b922f458068d Mon Sep 17 00:00:00 2001 From: castro-fidel Date: Thu, 16 Dec 2021 19:32:16 +0300 Subject: [PATCH] ###Scripts version 2056### --- data_from_portwine/changelog | 9 +++++++++ data_from_portwine/img/gui/duckstation.png | Bin 0 -> 1673 bytes data_from_portwine/img/gui/epsxe.png | Bin 0 -> 663 bytes data_from_portwine/img/gui/project64.png | Bin 0 -> 1911 bytes data_from_portwine/img/gui/vba-m.png | Bin 0 -> 1408 bytes data_from_portwine/img/gui/yabause.png | Bin 0 -> 2529 bytes data_from_portwine/scripts/functions_helper | 18 ++++++++++-------- .../scripts/portwine_db/GalaxyClient | 2 +- .../scripts/portwine_db/League of Legends | 2 +- .../scripts/pw_autoinstall/PW_DUCKSTATION | 17 +++++++++++++++++ .../scripts/pw_autoinstall/PW_EPSXE | 17 +++++++++++++++++ .../scripts/pw_autoinstall/PW_LOL | 2 +- .../scripts/pw_autoinstall/PW_PROJECT64 | 18 ++++++++++++++++++ .../scripts/pw_autoinstall/PW_VBA-M | 17 +++++++++++++++++ .../scripts/pw_autoinstall/PW_YABAUSE | 18 ++++++++++++++++++ data_from_portwine/scripts/runlib | 2 +- data_from_portwine/scripts/start.sh | 16 ++++++++++++++-- data_from_portwine/scripts/var | 2 +- portwine_install_script/PortProton-97 | 5 ++++- 19 files changed, 129 insertions(+), 16 deletions(-) create mode 100644 data_from_portwine/img/gui/duckstation.png create mode 100644 data_from_portwine/img/gui/epsxe.png create mode 100644 data_from_portwine/img/gui/project64.png create mode 100644 data_from_portwine/img/gui/vba-m.png create mode 100644 data_from_portwine/img/gui/yabause.png create mode 100755 data_from_portwine/scripts/pw_autoinstall/PW_DUCKSTATION create mode 100755 data_from_portwine/scripts/pw_autoinstall/PW_EPSXE create mode 100755 data_from_portwine/scripts/pw_autoinstall/PW_PROJECT64 create mode 100755 data_from_portwine/scripts/pw_autoinstall/PW_VBA-M create mode 100755 data_from_portwine/scripts/pw_autoinstall/PW_YABAUSE diff --git a/data_from_portwine/changelog b/data_from_portwine/changelog index 2ba78c90..9e77bd77 100755 --- a/data_from_portwine/changelog +++ b/data_from_portwine/changelog @@ -1,12 +1,21 @@ История изменений и дальнейшие планы: ----------------------------------------- В планах: +* проверить сохранение настроек DB файлов (версия протона) * перенести все библиотеки и бинарники добавленые нашим проектом в Portable * добавить проверку на существоваие каталога wine, если таковой нет, предложить стандартную версию, или скачать другую * добавить inxi в runtime и его вывод с аргументом -G в log * добавить проверку количества db файлов на один exe * заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru ----------------------------------------- +###Scripts version 2056### +* исключен xtrem из зависимостей (добавлено использование собственного эмулятора терминала с помощью yad) +* исправлена установка dotnet 4.5+ с помощью winetricks +* HOTFIX - скачивание библиотек и wine на некоторых системах (ТЕСТ) +* обновлен WINE_LOL_GE_6.16-5 со встроенными mono 6.3.0 + gecko 2.47.2 +* добавлены эмуляторы duckstation epsxe project64 vba-m yabause (спасибо chal55rus) +* обновлен PROTON_STEAM до версии 6.3-8C_PW1 (обновлены dxvk и vkd3d) + ###Scripts version 2055-1### * обновлен db AnomalyLauncher diff --git a/data_from_portwine/img/gui/duckstation.png b/data_from_portwine/img/gui/duckstation.png new file mode 100644 index 0000000000000000000000000000000000000000..4b0b9d211f3583cafc3e4306f1cebe9fd8643c3e GIT binary patch literal 1673 zcmV;426p+0P)_y5j0g8u{RRRDBg6vzNC0cEkbeH&t(!6~2!NKz>FAb5ue|HMOyJ)0Z@ zi~!#T?gmWYkH90q6cDsSq)xyd1A7{o{v5Z62oC_aqnJbSOFT{hOGNAIx`4yL_ka&> z2;@EB3E)@U!z@q2Rz&Ixog*L|y6geQBSU;5lBteLT;hBOm&ZvF!{q>qBfzHsqlMi7 zIE~;DB)`WYPZx-fY@R46J8Gzu3*1cMZ@^55w3=Xn%|r*QcUE(R{N zcqA^naX3zi-%w;Hv(1_68-JJ@lx)#&j)5L$JCYLQn3 zctmlz9fLohIMWV+qJTf8boz^eE)swSSbSf05Rc^0vJ0@<2bmFwb~ZR`gomO6R1lcW z!dyeW1Y!(W!s0AHHlo~>?B_fYzy^F$fM#l7Dkxrr`IE4G2HX;BN>YH0q6ktMJRUHT*t%DVSXF>koP@ad(FeLjyIDlK7Ey32ns|b>& zYF?^F0;}U7%iN}4!M86t{W5f(-XJW`hu{7~=kb$ilp(lwP;mU79HT=k;I}5Q zNuO~Y;sF#F5tSSy22h#zLv#a;qz0>gs0Se+SB6I?(%iZ`3Xv5CDn0`%7Gx2`80I{t zx(^E-#PKZ%Gz!i4q4W;I%0g-zDy7euq!)C?TeSIl{7qM(-!Z z2m!}#arrDR7sW5y zi9N)oeL$S3UQWOwyk;L#ilfTszv2Zawzvgc0fC$w;3?E%C2%yMl(Y!kd}1WBQha*umODRG7`cJoH(nCXTd#|`l9jUq z-rRRysfmwDw!8>b(Y%8jaBr_50O={d93XZkdh{UO?PT7!^snB6-YXUdc2U@|t1QgK zxVmue=yISvGc#ZWw@y{sNxm zkz;R-9)9ks>-Lo%_{P_m6_=G(9c|5=-IqdWdc}iF>#J=$z9IquGoK%X+$FSVv@>rxUs$yL|Kw%tWDMWGW6HW>$2I&9MLt6Q Tas3Cw00000NkvXXu0mjfrg{K! literal 0 HcmV?d00001 diff --git a/data_from_portwine/img/gui/epsxe.png b/data_from_portwine/img/gui/epsxe.png new file mode 100644 index 0000000000000000000000000000000000000000..d7b2950db290a707aa6fa54e236e998d6885af2a GIT binary patch literal 663 zcmV;I0%-k-P)$)(AM~F1fvVBg-vVC49 z>KnWdkMG(nrGk{|+?a!SN=veApG&C_1RPpxgy9STu-(3ZF?M!BZ9GB1F`Zs{z|jFS zIOh{^J}HTafE3Xh7nFLft%;%q0O0QKTRA7CLYD3G>GaC;n}})Sa(N2?)@Jj&EqENS z@aO(-F`lomT;A4rd?C`jO_d3Ab9H@}J1!m}(%c6Ct+jJw5b)ZZ*1A+odz5;${>AYM zKw*14KaI_D&{`ij)tMFq0WYnmIiM&<7|xI+8>g}`oFR%9c>MAm0PrjRZSma8X8^!F zF1V6pg9{gt+3_wH#)KzCnlpB3bvpn&JS31(l?n*k?F+O%SoNj`Wb6`*F}nl}W34r` zJ`^QjjMXx0I`@n*XnnAHhV#iW0S3+|mhE4E`~(2R@l#EV)`y}5QmV3%+CWOz>z&mb zQMAB%y*rx+I5uGr@Y?yVW^0~vVCN*R@)Wi|0Vr&*@<^$Q9=N{#Wc_%LtC;f%l4NsA zfY5Zrh?MT|CeXFsgjy^i(!2}wwDwg`Pj4Sy=RIJ8nyO2=30m8yAv+T|HQsqJ8**?0 zL(~)cy3m@yQ1yg9E;J_a7WITaE;J_aR`rA~7n})P@m x%LN+y)$GPrPiTtc0rvgf=e{3`_lom>;UC6!6`keUpZWj*002ovPDHLkV1j^qHFp32 literal 0 HcmV?d00001 diff --git a/data_from_portwine/img/gui/project64.png b/data_from_portwine/img/gui/project64.png new file mode 100644 index 0000000000000000000000000000000000000000..1baf892a00829d4516128168cb97bf9c129bf54a GIT binary patch literal 1911 zcmV--2Z;EIP)3&I6^5TXcQ!9DcpI?6HefJdB4dmRq%46@(T1foDNsV9N=>4w6>5{VqCsud7NRyt zQGrNNB2q>9feI7|(6EFpW-&`xOj&GW5HL2j$Ht!h&Yip8>5mFTz(mE6_Wb?Mcb-S* zd!-NhSWQh$%K~j3E9&a%hWB*_fTOP$&zv|m({8`?PDzpfY-8h(bHr9)O+zIb_MU*G}1$?`F-e ztXu?mh71{UMp2Z8nwlEpzY;hf+PkphN<1`w+Dk`zJJ0pyI?a}wkkT>6+MF0r%bZ_5 z|KX2c{n0Ci&Na(ohv4+SJbwIBOQX>!kys3e)7?~m_Uy+KCQe*)XHKtA@Z#bZe-OQN zVrzL`{P4bgyWU^Ee0jh7d!%qm6gs;g*omf_`11uC@;8f$hv~(GOJ6S=Iebsm=%GvF zQWB@j#kjE*j6Slh;^_7*3-6utfIxZq_{v4!AN@&HrAhgid}hsnms z6_T7mt+k2nA;$^d3Y0!uw&39YFZL|@&aAn$hz_x(t&2<{hqPf}VqzmASQ#Xn8))z9 zLZAFR-UZ|6-nxaZlCh-Y8u^8VCB1H-re^ZgtgNiXqejgFDlpX&4$6B_d`*;R6(A13 z!avPVa2QaKJ~x;4 zh{WZa4V-fBMx>3TnxripB(8-KOdEeim>tGCmtB}Opz^nW!t(i0l@yw)BBdk@#iGpb zp``gZ{ zA;qg!s^T^->zEty?N8q>GWrAm+L3UayR$Y z-3@56oQ&O$r@BH8kL5|DD-bagm{yvuND%3$#l)(YXf}`1Gwc!$r-@h3Cfl7sopAuY ze>Xirg~N!4C)|ArtHkUl=l8>FKYdjA0|KTJjS_D|P7Ws1&LqRi$FNmQ-Nv*{4kh<;aqoFb#`w9MYD84L zWE{(nTA}0;!bp!Vpve)UA!JFxV|&R+=io#qZ3$S0h1=_)Gq;^sGK53$;5gBrLM8vz z+J>XeeSyP$zoBXBVKf<8)^S=Q4o$>qx(S6s)So=Zz^-D9kd5tv{%~DVji0RMFwFwg$A8$*DGJcTrp6*}THM*B%!R_hmq^tys>`K}gO_ z945$d86~Zeq4vWJrV7sQzH}a#Us_t~ZEbB;pSXY&m72d*5Y}_DoNmhiJ*lIZ3c9MI zBn;P`z9$8T`<_698&}UBTvec5!_q|zNe2UL#m2C0_mhG?Q~)3t4F1L8v_HREe;un? zKy6hqH4DMEUA+x>;sQY0?;rT`iQ`8;DD#dm3cCg)UzZtJRP>Dqd~NxBz6li-72B(; xs?&vqg-;~)eX6x<*UnhKetp^hP2iiXe*;XMwi1a^^fLee002ovPDHLkV1l>XxU&EN literal 0 HcmV?d00001 diff --git a/data_from_portwine/img/gui/vba-m.png b/data_from_portwine/img/gui/vba-m.png new file mode 100644 index 0000000000000000000000000000000000000000..db3f24ed213f7c6607932941c552c9759c247e7f GIT binary patch literal 1408 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 literal 0 HcmV?d00001 diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 2c9fdd95..adef692e 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -96,7 +96,8 @@ check_process () { try_download () { set -o pipefail - wget --no-check-certificate --content-disposition -t 3 -T 5 "$1" --output-document="$2" 2>&1 | \ + wget -O "$2" --read-timeout 300 --retry-connrefused --timeout 15 --tries 3 \ + --user-agent="Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" "$1" 2>&1 | \ tr '\r' '\n' | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9,.]\+.\) \(.*\)/\1\n#Downloading at \1\/, \2\/s, ETA \3/; s/^20[0-9][0-9].*/#Done./' | \ zenity --progress --percentage=0 --title="Download $(basename $1)" --text=Starting... --auto-close --auto-kill --width=500 --height=90 if [ "${PIPESTATUS[0]}" != 0 ] ; then @@ -110,7 +111,8 @@ try_download () { try_download_to_path () { set -o pipefail - wget --no-check-certificate --content-disposition -t 3 -T 5 "$1" --directory-prefix="$2" 2>&1 | \ + wget --directory-prefix="$2" --read-timeout 300 --retry-connrefused --timeout 15 --tries 3 \ + --user-agent="Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" "$1" 2>&1 | \ tr '\r' '\n' | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9,.]\+.\) \(.*\)/\1\n#Downloading at \1\/, \2\/s, ETA \3/; s/^20[0-9][0-9].*/#Done./' | \ zenity --progress --percentage=0 --title="Download $(basename $1)" --text=Starting... --auto-close --auto-kill --width=500 --height=90 if [ "${PIPESTATUS[0]}" != 0 ] ; then @@ -122,7 +124,8 @@ try_download_to_path () { } try_download_silent () { - wget --no-check-certificate --content-disposition -t 3 -T 5 "$1" --output-document="$2" + wget -O "$2" --read-timeout 300 --retry-connrefused --timeout 15 --tries 3 \ + --user-agent="Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" "$1" if [ "${PIPESTATUS[0]}" != 0 ] ; then print_error "failed to download $1. Skipping." try_remove_file "$2" @@ -133,7 +136,7 @@ try_download_silent () { } zenity_error_download () { - `zenity --error --title "Error..." --text "You will need to check internet connettion,\nand press OK for repeet download" --no-wrap ` + `zenity --error --title "Error..." --text "You will need to check internet connection,\nand press OK for repeat download" --no-wrap ` [ "$?" != 0 ] && exit 1 || return 0 } @@ -364,7 +367,6 @@ pw_start_progress_bar_block () { } pw_stop_progress_bar () { - try_remove_file "${PORT_WINE_TMP_PATH}/update_pfx_log" while [ ! -z "`pgrep -a yad | grep "\-\-progress" | awk '{print $1}'`" ] do kill -n 9 `pgrep -a yad | grep "\-\-progress" | awk '{print $1}' | head -n 1` > /dev/null 2>&1 done @@ -823,11 +825,11 @@ gui_proton_downloader () { try_remove_file "${PORT_WINE_TMP_PATH}/tmp_proton_pw_set" try_remove_file "${PORT_WINE_TMP_PATH}/tmp_proton_set" try_remove_file "${PORT_WINE_TMP_PATH}/tmp_installed_wine_set" - `"${pw_yad}" --plug=$KEY_WINE --tabnum=2 --list --cheklist --separator="" --listen \ + `"${pw_yad}" --plug=$KEY_WINE --tabnum=2 --list --separator="" --listen \ --column "Select WINE for download:" < "${PORT_WINE_TMP_PATH}/tmp_proton_pw_git" 1> "${PORT_WINE_TMP_PATH}/tmp_proton_pw_set"` & - `"${pw_yad}" --plug=$KEY_WINE --tabnum=1 --list --cheklist --separator="" --listen \ + `"${pw_yad}" --plug=$KEY_WINE --tabnum=1 --list --separator="" --listen \ --column "Select WINE for download:" < "${PORT_WINE_TMP_PATH}/tmp_proton_ge_git" 1> "${PORT_WINE_TMP_PATH}/tmp_proton_set"` & - `"${pw_yad}" --plug=$KEY_WINE --tabnum=3 --list --cheklist --separator="" --listen \ + `"${pw_yad}" --plug=$KEY_WINE --tabnum=3 --list --separator="" --listen \ --column "Select installed WINE for delete:" < "${PORT_WINE_TMP_PATH}/tmp_installed_wine" 1> "${PORT_WINE_TMP_PATH}/tmp_installed_wine_set"` & `"${pw_yad}" --key=$KEY_WINE --notebook --width=500 --height=600 --text-align=center --center \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "Download..." --separator="" \ diff --git a/data_from_portwine/scripts/portwine_db/GalaxyClient b/data_from_portwine/scripts/portwine_db/GalaxyClient index cfb8dabf..e0967dcd 100755 --- a/data_from_portwine/scripts/portwine_db/GalaxyClient +++ b/data_from_portwine/scripts/portwine_db/GalaxyClient @@ -5,7 +5,7 @@ #Rating=1-5 ################################################ export WINEDLLOVERRIDES="galaxycommunication.exe=n;libglesv2=" -export LAUNCH_PARAMETERS="/runWithoutUpdating /deelevated" +export LAUNCH_PARAMETERS=("/runWithoutUpdating" "/deelevated") export PW_DLL_INSTALL="vcrun2019 mfc140" add_in_start_portwine () { diff --git a/data_from_portwine/scripts/portwine_db/League of Legends b/data_from_portwine/scripts/portwine_db/League of Legends index 2618879f..ee4a31ef 100755 --- a/data_from_portwine/scripts/portwine_db/League of Legends +++ b/data_from_portwine/scripts/portwine_db/League of Legends @@ -15,7 +15,7 @@ export PW_COMMENT_DB="${TEXT_OPSSL}Dwnload and start League of Legends can take ##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) ##export WINEDLLOVERRIDES="blabla=n,b" export LAUNCH_PARAMETERS=("--launch-product=league_of_legends" "--launch-patchline=live") # Additional launch options -export PW_WINE_USE=WINE_LOL_GE_6.16-3 +export PW_WINE_USE=WINE_LOL_GE_6.16-5 export PW_VULKAN_USE=1 export PW_MUST_HAVE_DLL="" ##export PW_USE_DXR10=1 diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_DUCKSTATION b/data_from_portwine/scripts/pw_autoinstall/PW_DUCKSTATION new file mode 100755 index 00000000..13a71fc3 --- /dev/null +++ b/data_from_portwine/scripts/pw_autoinstall/PW_DUCKSTATION @@ -0,0 +1,17 @@ +#!/bin/bash +# Author: chal55rus (Sergey P.) +######################################################################## +export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/duckstation-windows-x64-release.zip" +start_portwine +if try_download "https://github.com/stenzek/duckstation/releases/download/preview/duckstation-windows-x64-release.zip" "${PW_AUTOINSTALL_EXE}" +then + pw_start_progress_bar_block "Installing the VBA-M. Please wait..." + "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)/Duckstation" + portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Duckstation/duckstation-qt-x64-ReleaseLTCG.exe" + try_remove_file "${PW_AUTOINSTALL_EXE}" + kill_portwine + pw_stop_progress_bar + export PORTWINE_CREATE_SHORTCUT_NAME="DuckStation" + portwine_create_shortcut +fi +stop_portwine diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EPSXE b/data_from_portwine/scripts/pw_autoinstall/PW_EPSXE new file mode 100755 index 00000000..46e32e54 --- /dev/null +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EPSXE @@ -0,0 +1,17 @@ +#!/bin/bash +# Author: chal55rus (Sergey P.) +######################################################################## +export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/ePSXe205.zip" +start_portwine +if try_download "http://www.epsxe.com/files/ePSXe205.zip" "${PW_AUTOINSTALL_EXE}" +then + pw_start_progress_bar_block "Installing the VBA-M. Please wait..." + "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)/EPSXe" + portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/EPSXe/ePSXe.exe" + try_remove_file "${PW_AUTOINSTALL_EXE}" + kill_portwine + pw_stop_progress_bar + export PORTWINE_CREATE_SHORTCUT_NAME="ePSXe" + portwine_create_shortcut +fi +stop_portwine diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_LOL b/data_from_portwine/scripts/pw_autoinstall/PW_LOL index 916343a8..1480ace3 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_LOL +++ b/data_from_portwine/scripts/pw_autoinstall/PW_LOL @@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${WINEPREFIX}/drive_c/live.na.exe" export LAUNCH_PARAMETERS=("--launch-product=league_of_legends" "--launch-patchline=live") export PW_MUST_HAVE_DLL="" export PW_VULKAN_USE=1 -export PW_WINE_USE=WINE_LOL_GE_6.16-3 +export PW_WINE_USE=WINE_LOL_GE_6.16-5 if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then if try_download "https://github.com/Castro-Fidel/wine_builds/releases/download/${PW_WINE_USE}/${PW_WINE_USE}.tar.xz" \ diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_PROJECT64 b/data_from_portwine/scripts/pw_autoinstall/PW_PROJECT64 new file mode 100755 index 00000000..3ab99917 --- /dev/null +++ b/data_from_portwine/scripts/pw_autoinstall/PW_PROJECT64 @@ -0,0 +1,18 @@ +#!/bin/bash +# Author: chal55rus (Sergey P.) +######################################################################## +export LAUNCH_PARAMETERS=("/VERYSILENT") +export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Setup Project64 3.0.1-5664-2df3434.exe" +start_portwine +if try_download "https://www.pj64-emu.com/file/setup-project64-3-0-0-5632-f83bee9/" "${PW_AUTOINSTALL_EXE}" +then + pw_start_progress_bar_block "Installing the Project64. Please wait..." + pw_run "${PW_AUTOINSTALL_EXE}" + portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Project64 3.0/Project64.exe" + try_remove_file "${PW_AUTOINSTALL_EXE}" + kill_portwine + pw_stop_progress_bar + export PORTWINE_CREATE_SHORTCUT_NAME="Project64" + portwine_create_shortcut +fi +stop_portwine diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_VBA-M b/data_from_portwine/scripts/pw_autoinstall/PW_VBA-M new file mode 100755 index 00000000..24dd315e --- /dev/null +++ b/data_from_portwine/scripts/pw_autoinstall/PW_VBA-M @@ -0,0 +1,17 @@ +#!/bin/bash +# Author: chal55rus (Sergey P.) +######################################################################## +export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/visualboyadvance-m-Win-64bit.zip" +start_portwine +if try_download "https://github.com/visualboyadvance-m/visualboyadvance-m/releases/download/v2.1.4/visualboyadvance-m-Win-64bit.zip" "${PW_AUTOINSTALL_EXE}" +then + pw_start_progress_bar_block "Installing the VBA-M. Please wait..." + "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)/Visualboyadvance-m" + portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Visualboyadvance-m/visualboyadvance-m.exe" + try_remove_file "${PW_AUTOINSTALL_EXE}" + kill_portwine + pw_stop_progress_bar + export PORTWINE_CREATE_SHORTCUT_NAME="VBA-M" + portwine_create_shortcut +fi +stop_portwine diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_YABAUSE b/data_from_portwine/scripts/pw_autoinstall/PW_YABAUSE new file mode 100755 index 00000000..e1748c27 --- /dev/null +++ b/data_from_portwine/scripts/pw_autoinstall/PW_YABAUSE @@ -0,0 +1,18 @@ +#!/bin/bash +# Author: chal55rus (Sergey P.) +######################################################################## +export LAUNCH_PARAMETERS=("/S") +export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/yabause-0.9.15-win64.exe" +start_portwine +if try_download "https://download.tuxfamily.org/yabause/releases/0.9.15/yabause-0.9.15-win64.exe" "${PW_AUTOINSTALL_EXE}" +then + pw_start_progress_bar_block "Installing the Yabause. Please wait..." + pw_run "${PW_AUTOINSTALL_EXE}" + portwine_exe="$WINEPREFIX/drive_c/Program Files/yabause 0.9.15/yabause.exe" + try_remove_file "${PW_AUTOINSTALL_EXE}" + kill_portwine + pw_stop_progress_bar + export PORTWINE_CREATE_SHORTCUT_NAME="Yabause" + portwine_create_shortcut +fi +stop_portwine diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 19152702..44040278 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -439,7 +439,7 @@ start_portwine () { init_wine_ver fi ${pw_runtime} env PATH="${PATH}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" \ - "${PORT_WINE_TMP_PATH}/winetricks" -q -r ${PW_DLL_NEED_INSTALL} &>>"${PORT_WINE_TMP_PATH}/update_pfx_log" + "${PORT_WINE_TMP_PATH}/winetricks" -q -r -f ${PW_DLL_NEED_INSTALL} &>>"${PORT_WINE_TMP_PATH}/update_pfx_log" if [ "${PW_WINE_VER_FROM_DB}" != "${PW_PROTON_STEAM_VER}" ] ; then export PW_SILENT_RESTART=1 /bin/bash -c ${pw_full_command_line[*]} & diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 92e73291..f33d04e6 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -208,7 +208,14 @@ pw_winetricks () { init_wine_ver cabextract_fix start_portwine - ${PW_TERM} "${PORT_WINE_TMP_PATH}/winetricks" -q -r + while [[ -f "${PORT_WINE_TMP_PATH}/update_pfx_log" ]] ; do + sleep 1 + while read -r line ; do + echo "# ${line}" + done + done < "${PORT_WINE_TMP_PATH}/update_pfx_log" | "${pw_yad_new}" --text-info --tail --no-buttons --title="WINETRICKS" \ + --center --auto-close --skip-taskbar --width=$PW_GIF_SIZE_X --height=$PW_GIF_SIZE_Y & + "${PORT_WINE_TMP_PATH}/winetricks" -q -r -f &>>"${PORT_WINE_TMP_PATH}/update_pfx_log" stop_portwine } @@ -345,7 +352,12 @@ else --field=" RetroArch"!"$PW_GUI_ICON_PATH/retroarch.png":"BTN" '@bash -c "button_click PW_RETROARCH"' \ --field=" PPSSPP Windows"!"$PW_GUI_ICON_PATH/ppsspp.png":"BTN" '@bash -c "button_click PW_PPSSPP"' \ --field=" Citra"!"$PW_GUI_ICON_PATH/citra.png":"BTN" '@bash -c "button_click PW_CITRA"' \ - --field=" Cemu"!"$PW_GUI_ICON_PATH/cemu.png":"BTN" '@bash -c "button_click PW_CEMU"' & + --field=" Cemu"!"$PW_GUI_ICON_PATH/cemu.png":"BTN" '@bash -c "button_click PW_CEMU"' \ + --field=" DuckStation"!"$PW_GUI_ICON_PATH/duckstation.png":"BTN" '@bash -c "button_click PW_DUCKSTATION"' \ + --field=" ePSXe"!"$PW_GUI_ICON_PATH/epsxe.png":"BTN" '@bash -c "button_click PW_EPSXE"' \ + --field=" Project64"!"$PW_GUI_ICON_PATH/project64.png":"BTN" '@bash -c "button_click PW_PROJECT64"' \ + --field=" VBA-M"!"$PW_GUI_ICON_PATH/vba-m.png":"BTN" '@bash -c "button_click PW_VBA-M"' \ + --field=" Yabause"!"$PW_GUI_ICON_PATH/yabause.png":"BTN" '@bash -c "button_click PW_YABAUSE"' & "${pw_yad}" --plug=$KEY --tabnum=2 --form --columns=3 --scroll --height=500 \ --field=" Wargaming Game Center"!"$PW_GUI_ICON_PATH/wgc.png":"BTN" '@bash -c "button_click PW_WGC"' \ diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 15a93aa7..3bd58a5a 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -35,7 +35,7 @@ export WINE_WIN_START="start.exe /i /unix" export PW_WINE_USE=PROTON_STEAM export PW_PLUGINS_VER="_v1" ###WINE_PROTON_STEAM### -export PW_STEAM_VER="6.3-8" +export PW_STEAM_VER="6.3-8C_PW1" export PW_PROTON_STEAM_VER="PROTON_STEAM_${PW_STEAM_VER}" ###WINE_PROTON_GE### export PW_GE_VER="6.19-5" diff --git a/portwine_install_script/PortProton-97 b/portwine_install_script/PortProton-97 index 2540d73f..ceae0832 100755 --- a/portwine_install_script/PortProton-97 +++ b/portwine_install_script/PortProton-97 @@ -121,7 +121,10 @@ esac export PORT_WINE_TMP_PATH="${PORT_WINE_PATH}/data/tmp" cd "${PORT_WINE_PATH}" try_download_scripts () { - wget -c -t 5 -T 20 "https://github.com/Castro-Fidel/PortWINE/archive/refs/heads/master.tar.gz" --output-document="${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz" + wget -O "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz" -nd -c --read-timeout 300 \ + --retry-connrefused --timeout 15 --tries 3 \ + --user-agent="Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" \ + "https://github.com/Castro-Fidel/PortWINE/archive/refs/heads/master.tar.gz" if [ "$?" = "0" ] ; then tar -xvzf "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz" -C "${PORT_WINE_TMP_PATH}" if [ "$?" = "0" ] ; then