From 846167f80f8113a23eaeabeb99753a565f498f28 Mon Sep 17 00:00:00 2001 From: castro-fidel Date: Thu, 25 Nov 2021 22:59:41 +0300 Subject: [PATCH] ###Scripts version 2055### --- data_from_portwine/changelog | 7 ++++++- .../img/gui/{Bethesda.png => bethesda.png} | Bin data_from_portwine/img/gui/cemu.png | Bin 0 -> 1699 bytes .../scripts/portwine_db/League of Legends | 2 +- .../scripts/pw_autoinstall/PW_CEMU | 18 +++++++++++++++++ data_from_portwine/scripts/runlib | 19 +++++++++++++----- data_from_portwine/scripts/start.sh | 5 +++-- data_from_portwine/scripts/var | 4 ++-- 8 files changed, 44 insertions(+), 11 deletions(-) rename data_from_portwine/img/gui/{Bethesda.png => bethesda.png} (100%) create mode 100644 data_from_portwine/img/gui/cemu.png create mode 100755 data_from_portwine/scripts/pw_autoinstall/PW_CEMU diff --git a/data_from_portwine/changelog b/data_from_portwine/changelog index f9dfb4ea..3b1bd297 100755 --- a/data_from_portwine/changelog +++ b/data_from_portwine/changelog @@ -7,8 +7,13 @@ * добавить проверку количества db файлов на один exe * заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru ----------------------------------------- +###Scripts version 2055### +* обновлен PROTON_STEAM до версии 6.3-8 (опять =) +* копирование шрифтов заменено на создание символьных ссылок +* в установщики эмуляторов добавлен Cemu + ###Scripts version 2054### -* добавлен новый пунк в меню PortProton для установки эмуляторов (спасибо chal55rus) +* добавлен новый пункт в меню PortProton для установки эмуляторов (спасибо chal55rus) ###Scripts version 2053### * HOTFIX - исправлены ошибки создания симлинков некоторых библиоткек из plugins_v1 diff --git a/data_from_portwine/img/gui/Bethesda.png b/data_from_portwine/img/gui/bethesda.png similarity index 100% rename from data_from_portwine/img/gui/Bethesda.png rename to data_from_portwine/img/gui/bethesda.png diff --git a/data_from_portwine/img/gui/cemu.png b/data_from_portwine/img/gui/cemu.png new file mode 100644 index 0000000000000000000000000000000000000000..fe86e6bb45c9b092e97e89f463145976942c99c3 GIT binary patch literal 1699 zcmV;U23+}xP)uXcO zNF(jl{_lVOXU@!=bCrlFrm_1sZ`S=EcWMYs2b*jbR4uME|J<|3Ob1h50vgwTsWv@) zd6Q*X_bHf*n9z+yA2+S9p>(@zOjFXxzSC_j!_x{_wqb)#4Gw+B5_bo|aO6t;3PvmM zKz#li4=$k7NkW&-5Iyr>BstoX7WJc=Wour1^M&8!vXT=pXa0QcH|D95PLHv!G{baLrtpnkruN@|AlCLOX`_C5``ybP|JQTRnF0Ze8kcUjwR*bqtB*0TV8cxY z^)jLQy}wiY+OsCm=-R2X;|*tf|*g`p#3w+lFlbOIwdhC=%&j`5=flL(EoepA%r~9e%2U z+7r_`V%XU}%I~|oa-Ge%VLxX7*^+?1_kZRv%LQ>81nmlF_HT6W>-=6#6wryJ1 zHY|^6txH{hD3ks?w~S%W;u7Kkg^1ud4!?N$Aj=Q-@}z$$`(sPlU$%%Rl65S5wTC0; zdy(;XAE}S9!aoYeOyV`Z0Ek3BId%-KM6_gAUIbhhvsfLsFvehvVef&r`B}1_RBiou zvLshCy^$)mwxt*zOJR&bD|qBqHHkChWP}1bm-S+h5gxkLhViryUKwUbhepC>Q;-Vh zCCJ~-k6?@;nM!e&FM&0dDB?8*g>Gl}U9x}X{gGWgK=b=&8LX-+Shbfub!vz|9(tE^ zW14F$kF|?ikbHyVV|`l7b1Xd$jg9n zb2ug7x)aZW8W(wU@iSxwA-e@`hQ2rhS5p)F4-m1`b@%`O7m$|$vLmyo3wja;$IbLJ zKy8VFk?RZaYp4%ty2pfJM{qm^7_thqNVX~qCsy~E%jL0jZU{A$`=;#we4igu99$Kq z<%?mCt_w5Y9hig>k=#ydBk9b88LxqHA9IDHmlC+Hi|e|qyRDQ^Dp7#(^7S!=7#ABu z$Vt%EKQtL96T?UwH>=DPfn5IjNdm{o2)HHWXLBv!P93~VxonzgL3xOX;_~!eeyaR}>$)V9DfWKQ2ev(J25j43k^&r^ z8ujP5AwU}VaoZLCwAvyX^kV@#7KYf^o2IEJO=m*zX;@fl@%34LW`%XGb@#pTF0GN< zDdx-&CsCGd%0IstyF`bFM5#`He^*@wTsUajCBV1dy1=d#apI+60M^7cYvRS1m(0pV zg#CwG*x6qOv7pB}0KvWvM5O(|zP(2O<=H05s98d4M*v(H~dYzy4l;MnqeWKaUah=km&`pJ(G1e44F#;NeLB=?`|1 z8vBM5iRr7e8%b8wV(icGX$Dy7B!Pi0qUT%DiQyE!z_0zK<&U2{@}Jy<_WU?qc+dLP z&b6U$iZL5aIu!%4Ka&Eb9LwkLMcc1iq3|;&-#L7I5@fp1^ZUO01OG@*Pb?TMtx*&= t=+q|Tes!?#Lix;DLrr^jdY(xD{{wlg9u^~UQlkI>002ovPDHLkV1hW_PCNhr literal 0 HcmV?d00001 diff --git a/data_from_portwine/scripts/portwine_db/League of Legends b/data_from_portwine/scripts/portwine_db/League of Legends index 195e0801..2618879f 100755 --- a/data_from_portwine/scripts/portwine_db/League of Legends +++ b/data_from_portwine/scripts/portwine_db/League of Legends @@ -91,4 +91,4 @@ add_in_start_portwine () { pkexec /bin/bash -c 'sysctl -w abi.vsyscall32=0 && sysctl -p' fi check_port_for_lol & -} \ No newline at end of file +} diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_CEMU b/data_from_portwine/scripts/pw_autoinstall/PW_CEMU new file mode 100755 index 00000000..e4b0ed03 --- /dev/null +++ b/data_from_portwine/scripts/pw_autoinstall/PW_CEMU @@ -0,0 +1,18 @@ +#!/bin/bash +# Author: PortWINE-Linux.ru +######################################################################## +export PW_URL_CEMU=($(curl -s "https://cemu.info" | grep "zip" | cut -d \" -f 2)) +export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/`echo ${PW_URL_CEMU} | awk -F/ '{print $5}'`" +start_portwine +if try_download "${PW_URL_CEMU}" "${PW_AUTOINSTALL_EXE}" +then + pw_start_progress_bar_block "Installing the Cemu. Please wait..." + "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)" + 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}" + kill_portwine + pw_stop_progress_bar + export PORTWINE_CREATE_SHORTCUT_NAME="Cemu" + portwine_create_shortcut +fi +stop_portwine diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index a87f5c3b..19152702 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -264,11 +264,20 @@ start_portwine () { [ ! -d "${WINEPREFIX}/dosdevices/c:" ] && try_force_link_dir "${WINEPREFIX}/drive_c/" "${WINEPREFIX}/dosdevices/c:" [ ! -d "${WINEPREFIX}/dosdevices/z:" ] && try_force_link_dir "/" "${WINEPREFIX}/dosdevices/z:" create_new_dir "${WINEPREFIX}/drive_c/windows/Fonts/" - try_copy_file "${WINEDIR}/share/fonts/"LiberationSans-Regular.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"arial.ttf - try_copy_file "${WINEDIR}/share/fonts/"LiberationSans-Bold.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"arialbd.ttf - try_copy_file "${WINEDIR}/share/fonts/"LiberationSerif-Regular.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"times.ttf - try_copy_file "${WINEDIR}/share/fonts/"LiberationMono-Regular.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"cour.ttf - try_copy_file "${WINEDIR}/share/fonts/"SourceHanSansSCRegular.otf "${WINEPREFIX}/drive_c/windows/Fonts/"msyh.ttf + try_force_link_file "${WINEDIR}/share/fonts/"LiberationSans-Regular.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"arial.ttf + try_force_link_file "${WINEDIR}/share/fonts/"LiberationSans-Bold.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"arialbd.ttf + try_force_link_file "${WINEDIR}/share/fonts/"LiberationSerif-Regular.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"times.ttf + try_force_link_file "${WINEDIR}/share/fonts/"LiberationMono-Regular.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"cour.ttf + try_force_link_file "${WINEDIR}/share/fonts/"LiberationMono-Bold.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"courbd.ttf + try_force_link_file "${WINEDIR}/share/fonts/"msyh.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"msyh.ttf + try_force_link_file "${WINEDIR}/share/fonts/"malgun.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"malgun.ttf + try_force_link_file "${WINEDIR}/share/fonts/"micross.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"micross.ttf + try_force_link_file "${WINEDIR}/share/fonts/"nirmala.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"nirmala.ttf + + try_force_link_file "${WINEDIR}/share/fonts/"simsun.ttc "${WINEPREFIX}/drive_c/windows/Fonts/"simsun.ttc + try_force_link_file "${WINEDIR}/share/fonts/"msgothic.ttc "${WINEPREFIX}/drive_c/windows/Fonts/"msgothic.ttc + + try_force_link_file "${WINEDIR}/share/wine/fonts/"tahoma.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"tahoma.ttf } if [[ ! -d "${WINEPREFIX}" || ! -d "${WINEPREFIX}"/drive_c/windows || ! -d "${WINEPREFIX}/dosdevices" || \ ! -f "${WINEPREFIX}"/userdef.reg || ! -f "${WINEPREFIX}"/system.reg || ! -f "${WINEPREFIX}"/user.reg ]] diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index d82a2cdb..92e73291 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -344,7 +344,8 @@ else --field=" ScummVM"!"$PW_GUI_ICON_PATH/scummvm.png":"BTN" '@bash -c "button_click PW_SCUMMVM"' \ --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=" 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"' & "${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"' \ @@ -355,7 +356,7 @@ else --field=" Steam Client Launcher"!"$PW_GUI_ICON_PATH/steam.png":"BTN" '@bash -c "button_click PW_STEAM"' \ --field=" EVE Online Launcher"!"$PW_GUI_ICON_PATH/eve.png":"BTN" '@bash -c "button_click PW_EVE"' \ --field=" Origin Launcher"!"$PW_GUI_ICON_PATH/origin.png":"BTN" '@bash -c "button_click PW_ORIGIN"' \ - --field=" Bethesda.net Launcher"!"$PW_GUI_ICON_PATH/Bethesda.png":"BTN" '@bash -c "button_click PW_BETHESDA"' \ + --field=" Bethesda.net Launcher"!"$PW_GUI_ICON_PATH/bethesda.png":"BTN" '@bash -c "button_click PW_BETHESDA"' \ --field=" Rockstar Games Launcher"!"$PW_GUI_ICON_PATH/Rockstar.png":"BTN" '@bash -c "button_click PW_ROCKSTAR"' \ --field=" My.Games Launcher"!"$PW_GUI_ICON_PATH/mygames.png":"BTN" '@bash -c "button_click PW_MYGAMES"' \ --field=" OSU"!"$PW_GUI_ICON_PATH/osu.png":"BTN" '@bash -c "button_click PW_OSU"' \ diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 40cd220e..15a93aa7 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/bin/bash #Author: Castro-Fidel (PortWINE-Linux.ru) -#SCRIPTS_NEXT_VERSION=2054 +#SCRIPTS_NEXT_VERSION=2055 #PORT_NEXT_VERSION=97 ######################################################################## export PW_MANGOHUD=1 @@ -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-7" +export PW_STEAM_VER="6.3-8" export PW_PROTON_STEAM_VER="PROTON_STEAM_${PW_STEAM_VER}" ###WINE_PROTON_GE### export PW_GE_VER="6.19-5"