Scripts version 2134

2022-10-09 18:52:00 +03:00
parent 6620fa6582
commit dbdc0d5a77
11 changed files with 77 additions and 34 deletions
--- a/data_from_portwine/changelog_eng
+++ b/data_from_portwine/changelog_eng
@@ -2,6 +2,11 @@ You can help us in the development of the project on the website: boosty.to/linu
 -----------------------------------------
 Changelog:

+###Scripts version 2134###
+* added the WINE-GE-CUSTOM tab in GET_OTHER_WINE to download versions of wine LUTRIS
+* updated the PROTON_LG 7.31 version (together with dxvk and vkd3d)
+* changed the MY.GAMES auto-installer to vkPlay (with the creation of a separate VK_PLAY prefix)
+
 ###Scripts version 2133###
 * update libs_v33 (steam runtime sniper container 09/29/2022, version MANGOHUD 0.6.8)
 * update plugins_v8 (updated version of FAKE DLSS - FSR 2.1.1)
--- a/data_from_portwine/changelog_rus
+++ b/data_from_portwine/changelog_rus
@@ -2,6 +2,11 @@
 -----------------------------------------
 История изменений:

+###Scripts version 2134###
+* добавлена вкладка WINE-GE-CUSTOM в GET_OTHER_WINE для скачивания версий вайн LUTRIS
+* обновлена версия PROTON_LG 7.31 (совместно с dxvk и vkd3d)
+* изменён автоустановщик MY.GAMES на vkPlay (с созданием отдельного префикса VK_PLAY)
+
 ###Scripts version 2133###
 * обновление libs_v33 (контейнер steam runtime sniper 29.09.2022, версия MANGOHUD 0.6.8)
 * обновление plugins_v8 (обновлена версия FAKE DLSS - FSR 2.1.1)
--- a/data_from_portwine/scripts/credits
+++ b/data_from_portwine/scripts/credits
@@ -64,7 +64,7 @@ zorn
 "${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=4 \
 --text-info --fontname="Serif bold italic 12" --show-uri --scroll \
 <<< '                                            Проект поддержали:
-                                    https://boosty.to/linux-gaming.ru
+                                    https://boosty.to/portwine-linux.ru

    1 1
    A B
@@ -269,7 +269,7 @@ Discord:  http://discord.gg/yJSEFjF
 VK:       https://vk.com/linuxgamingru
 -------------------------------------------
 Стать платным подписчиком:
-boosty: https://boosty.to/linux-gaming.ru
+boosty: https://boosty.to/portwine-linux.ru
 patreon: https://www.patreon.com/portproton
 Кошельки WebMoney:   WMZ-Z135951244401   WME-E325631629973
 Yandex кошелек:   410012267513818
@@ -359,7 +359,7 @@ SOFTWARE." &
 "${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=4 \
 --text-info --fontname="Serif bold italic 12" --show-uri --scroll \
 <<< '                                    The project was supported:
-                              https://boosty.to/linux-gaming.ru:
+                              https://boosty.to/portwine-linux.ru:

    1 1
    A B
@@ -562,7 +562,7 @@ Discord:  http://discord.gg/yJSEFjF
 VK:       https://vk.com/portwinelinux
 -------------------------------------------
 Become a paid subscriber:
-boosty:  https://boosty.to/linux-gaming.ru
+boosty:  https://boosty.to/portwine-linux.ru
 patreon: https://www.patreon.com/portproton
 WebMoney wallets:   WMZ-Z135951244401   WME-E325631629973
 Yandex wallet:   410012267513818
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -268,10 +268,10 @@ init_wine_ver () {
    export WINE="${WINEDIR}/bin/wine"
    export WINELOADER="${WINEDIR}/bin/wine"
    export WINESERVER="${WINEDIR}/bin/wineserver"
-    if [[ -z "${PATH_TO_GAME}" ]] ; then
+
    export WINEDLLPATH="${WINEDIR}/lib64/wine:${WINEDIR}/lib/wine"
-    else
-        export WINEDLLPATH="${WINEDIR}/lib64/wine:${WINEDIR}/lib/wine:${PATH_TO_GAME}"
+    if [[ ! -z "${PATH_TO_GAME}" ]] ; then
+        export WINEDLLPATH+=":${PATH_TO_GAME}"
    fi

    if [[ -d "${WINEDIR}/files" && ! -d "${WINEDIR}/dist" ]] ; then
@@ -295,6 +295,11 @@ init_wine_ver () {
    if [[ -d "${WINEDIR}" ]] ; then
        [[ ! -f "${WINEDIR}/version" ]] && echo "${PW_WINE_USE}" > "${WINEDIR}/version"

+        # if [[ -d "${WINEDIR}/lib32/" ]] ; then
+        #     mv -f "${WINEDIR}/lib" "${WINEDIR}/lib64"
+        #     mv -f "${WINEDIR}/lib32" "${WINEDIR}/lib"
+        # fi
+
        if [[ ! -d "${WINEDIR}/lib64/" && -d "${WINEDIR}/lib/wine/x86_64-unix" ]] ; then
            create_new_dir "${WINEDIR}/lib64/wine"
            mv -f "${WINEDIR}/lib/wine/x86_64-unix" "${WINEDIR}/lib64/wine/"
--- a/data_from_portwine/scripts/portwine_db/VKPlayLoader
+++ b/data_from_portwine/scripts/portwine_db/VKPlayLoader
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+#Author: castro-fidel
+#VKPlayLoader.exe
+#Rating=5
+#####################examples###########################
+##export PW_COMMENT_DB="blablabla"
+export PW_WINDOWS_VER="10"
+export PW_WINE_USE="PROTON_LG"
+export WINEDLLOVERRIDES="mscoree,mshtml="
+export PW_MUST_HAVE_DLL=""
+export PW_PREFIX_NAME="VK_PLAY"
+export PW_VIRTUAL_DESKTOP="1"
--- a/data_from_portwine/scripts/pw_autoinstall/PW_MYGAMES
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_MYGAMES
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-# Author: chal55rus (Sergey P.)
-########################################################################
-export LAUNCH_PARAMETERS=("")
-export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/MyGamesLoader.exe"
-start_portwine
-if try_download "static.gc.my.games/MyGamesLoader.exe" "${PW_AUTOINSTALL_EXE}"
-then
-    pw_start_progress_bar_block "Installing the My.Games. Please wait..."
-    pw_kill_autostart GameCenter.exe &
-    pw_run "${PW_AUTOINSTALL_EXE}"
-    portwine_exe="$WINEPREFIX/drive_c/users/steamuser/AppData/Local/GameCenter/GameCenter.exe"
-    try_remove_file "${PW_AUTOINSTALL_EXE}"
-    kill_portwine
-    pw_stop_progress_bar
-    export PORTWINE_CREATE_SHORTCUT_NAME="MY.GAMES"
-    portwine_create_shortcut
-fi
-stop_portwine
--- a/data_from_portwine/scripts/pw_autoinstall/PW_VKPLAY
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_VKPLAY
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Author: chal55rus (Sergey P.)
+########################################################################
+export LAUNCH_PARAMETERS=("")
+export PW_PREFIX_NAME="VK_PLAY"
+export PW_AUTOINSTALL_EXE="${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/steamuser/AppData/Local/VKPlayLoader.exe"
+export WINEDLLOVERRIDES="mscoree,mshtml="
+export PW_MUST_HAVE_DLL=""
+
+start_portwine
+if try_download "static.gc.my.games/VKPlayLoader.exe" "${PW_AUTOINSTALL_EXE}"
+then
+    portwine_exe="$WINEPREFIX/drive_c/users/steamuser/AppData/Local/VKPlayLoader.exe"
+    pw_stop_progress_bar
+    export PORTWINE_CREATE_SHORTCUT_NAME="vkPlay"
+    portwine_create_shortcut
+fi
+stop_portwine
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -652,7 +652,7 @@ else
    --field="   EVE Online Launcher"!"$PW_GUI_ICON_PATH/eve.png"!"":"FBTN" '@bash -c "button_click PW_EVE"' \
    --field="   Origin Launcher"!"$PW_GUI_ICON_PATH/origin.png"!"":"FBTN" '@bash -c "button_click PW_ORIGIN"' \
    --field="   Rockstar Games Launcher"!"$PW_GUI_ICON_PATH/Rockstar.png"!"":"FBTN" '@bash -c "button_click PW_ROCKSTAR"' \
-    --field="   My.Games Launcher"!"$PW_GUI_ICON_PATH/mygames.png"!"":"FBTN" '@bash -c "button_click PW_MYGAMES"' \
+    --field="   vkPlay Games Center"!"$PW_GUI_ICON_PATH/mygames.png"!"":"FBTN" '@bash -c "button_click PW_VKPLAY"' \
    --field="   Ankama Launcher"!"$PW_GUI_ICON_PATH/ankama.png"!"":"FBTN" '@bash -c "button_click PW_ANKAMA"' \
    --field="   OSU"!"$PW_GUI_ICON_PATH/osu.png"!"":"FBTN" '@bash -c "button_click PW_OSU"' \
    --field="   League of Legends"!"$PW_GUI_ICON_PATH/lol.png"!"":"FBTN" '@bash -c "button_click PW_LOL"' \
--- 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=2133
+#SCRIPTS_NEXT_VERSION=2134
 ########################################################################
 export PW_MANGOHUD=0
 export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt
@@ -35,7 +35,7 @@ export PW_WINE_USE="PROTON_LG"
 export PW_PLUGINS_VER="_v8"
 export PW_FAKE_DLSS_VER="051022"
 ###WINE_PROTON_LG###
-export PW_LG_VER="7-29"
+export PW_LG_VER="7-31"
 export PW_PROTON_LG_VER="PROTON_LG_${PW_LG_VER}"
 ###WINE_PROTON_GE###
 export PW_GE_VER="7-33"
--- a/data_from_portwine/scripts/zen_yad_gui
+++ b/data_from_portwine/scripts/zen_yad_gui
@@ -250,6 +250,16 @@ gui_proton_downloader () {
        sed -i '/-x86/d' "${PORT_WINE_TMP_PATH}/tmp_wine_kron4ek_git"
    fi

+    #WINE_GE_CUSTOM
+    export WINE_GE_CUSTOM=($(curl -s "https://api.github.com/repos/GloriousEggroll/wine-ge-custom/releases" | grep "browser_download_url.*\.tar\.xz" | cut -d \" -f 4))
+    try_remove_file "${PORT_WINE_TMP_PATH}/tmp_wine_ge_custom_git"
+    if [[ ! -z "${WINE_GE_CUSTOM}" ]] ; then
+        for PGEGIT in ${WINE_GE_CUSTOM[@]} ; do
+            echo ${PGEGIT} | awk -F/ '{print $NF}' | sed 's/.tar.xz//' >> "${PORT_WINE_TMP_PATH}/tmp_wine_ge_custom_git"
+        done
+        sed -i '/6.23/,$d' "${PORT_WINE_TMP_PATH}/tmp_wine_ge_custom_git"
+    fi
+
    #PROTON_LG
    export PROTON_PW_GIT=($(curl -s "https://api.github.com/repos/Castro-Fidel/wine_builds/releases" | grep "browser_download_url.*\.tar\.xz" | cut -d \" -f 4))
    try_remove_file "${PORT_WINE_TMP_PATH}/tmp_proton_pw_git"
@@ -270,6 +280,7 @@ gui_proton_downloader () {
        sed -i "/${INSTALLING_VERSION_IN_DIST}$/Id" "${PORT_WINE_TMP_PATH}/tmp_proton_ge_git"
        sed -i "/${INSTALLING_VERSION_IN_DIST}$/Id" "${PORT_WINE_TMP_PATH}/tmp_proton_pw_git"
        sed -i "/${INSTALLING_VERSION_IN_DIST}$/Id" "${PORT_WINE_TMP_PATH}/tmp_wine_kron4ek_git"
+        sed -i "/${INSTALLING_VERSION_IN_DIST}$/Id" "${PORT_WINE_TMP_PATH}/tmp_wine_ge_custom_git"
    done
 	#Installed wine
 	ls -l ${PORT_WINE_PATH}/data/dist | awk '{print $9}' | sed '/^$/d' > ${PORT_WINE_TMP_PATH}/tmp_installed_wine	
@@ -286,21 +297,26 @@ gui_proton_downloader () {
    `"${pw_yad}" --plug=$KEY_WINE --tabnum=3 --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=4 --list --separator="" --listen \
+    --column "Select WINE for download:" < "${PORT_WINE_TMP_PATH}/tmp_wine_ge_custom_git" 1> "${PORT_WINE_TMP_PATH}/tmp_ge_custom_set"` &
+    `"${pw_yad}" --plug=$KEY_WINE --tabnum=5 --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="" \
-    --tab-pos=top --tab="PROTON-LG" --tab="KRON4EK"  --tab="PROTON-GE" --tab="INSTALLED"`
+    --tab-pos=top --tab="PROTON-LG" --tab="WINE-KRON4EK"  --tab="PROTON-GE" --tab="WINE-GE-CUSTOM" --tab="INSTALLED"`
    YAD_WINE_STATUS="$?"
    if [[ "$YAD_WINE_STATUS" == "1" || "$YAD_WINE_STATUS" == "252" ]] ; then
        /usr/bin/env bash -c ${pw_full_command_line[*]} &
        exit 0
    fi
+    
    if [ ! -z `cat "${PORT_WINE_TMP_PATH}/tmp_proton_set" | awk '{print $1}'` ] ; then
        export VERSION_WINE_GIT="`cat "${PORT_WINE_TMP_PATH}/tmp_proton_set"`"
    elif [ ! -z `cat "${PORT_WINE_TMP_PATH}/tmp_proton_pw_set" | awk '{print $1}'` ] ; then
        export VERSION_WINE_GIT="`cat "${PORT_WINE_TMP_PATH}/tmp_proton_pw_set"`"
    elif [ ! -z `cat "${PORT_WINE_TMP_PATH}/tmp_kron4ek_set" | awk '{print $1}'` ] ; then
        export VERSION_WINE_GIT="`cat "${PORT_WINE_TMP_PATH}/tmp_kron4ek_set"`"
+    elif [ ! -z `cat "${PORT_WINE_TMP_PATH}/tmp_ge_custom_set" | awk '{print $1}'` ] ; then
+        export VERSION_WINE_GIT="`cat "${PORT_WINE_TMP_PATH}/tmp_ge_custom_set"`"
    elif [ ! -z `cat "${PORT_WINE_TMP_PATH}/tmp_installed_wine_set" | awk '{print $1}'` ] ; then
        export VERSION_INSTALLED_WINE="`cat "${PORT_WINE_TMP_PATH}/tmp_installed_wine_set"`"
    fi
@@ -309,9 +325,10 @@ gui_proton_downloader () {
    try_remove_file "${PORT_WINE_TMP_PATH}/tmp_proton_pw_git"
    try_remove_file "${PORT_WINE_TMP_PATH}/tmp_wine_kron4ek_git"
    try_remove_file "${PORT_WINE_TMP_PATH}/tmp_proton_set"
+    try_remove_file "${PORT_WINE_TMP_PATH}/tmp_ge_custom_set"
    try_remove_file "${PORT_WINE_TMP_PATH}/tmp_installed_wine"

-    for GIVE_WINE_URL in ${PROTON_GE_GIT[@]} ${PROTON_PW_GIT[@]} ${WINE_KRON4EK[@]}; do
+    for GIVE_WINE_URL in ${PROTON_GE_GIT[@]} ${PROTON_PW_GIT[@]} ${WINE_KRON4EK[@]} ${WINE_GE_CUSTOM[@]} ; do
        if [ ! -z `echo ${GIVE_WINE_URL} | grep -i "$VERSION_WINE_GIT"` ] ; then
            export URL_VERSION_PROTON_GIT="${GIVE_WINE_URL}"
        fi
--- a/portwine_install_script/PortProton_1.0
+++ b/portwine_install_script/PortProton_1.0
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Author: Castro-Fidel (PortWINE-Linux.ru)
+# Author: Castro-Fidel (linux-gaming.ru)
 # License MIT
 ########################################################################
 unset PW_AUTOPLAY PW_SET_LANG PW_SILENT_INSTALL