Scripts version 2139

2022-11-06 17:16:02 +03:00
parent 21c21f8769
commit d8f96debe9
8 changed files with 86 additions and 14 deletions
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -233,12 +233,39 @@ pw_clear_pfx () {
    try_remove_dir "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/Program Files (x86)/Common Files"
    try_remove_dir "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/Program Files (x86)/Windows Media Player"
    try_remove_dir "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/Program Files (x86)/Windows NT"
-    try_remove_dir "${PORT_WINE_TMP_PATH}/mesa_shader_cache"
    rm -f "${PORT_WINE_TMP_PATH}"/*.bin
    rm -f "${PORT_WINE_TMP_PATH}"/*.foz
    return 0
 }

+pw_reinstall_pp () {
+    if [[ "${PW_REINSTALL_FROM_TERMINAL}" == 1 ]] ; then
+        read -p "Do you want to reinstall PortProton? (Y,y - Yes):   " -n 1 -r
+        if [[ ! $REPLY =~ ^[Yy]$ ]]
+        then
+            echo
+            exit 1
+        fi
+    elif ! gui_question "${port_reinstall}" 
+    then exit 1
+    fi
+    pw_clear_pfx
+    try_remove_dir "${PORT_WINE_PATH}/data/dist"
+    try_remove_dir "${PORT_WINE_TMP_PATH}/mesa_shader_cache"
+    try_remove_dir "${PORT_WINE_TMP_PATH}/vkd3d_cache"
+    try_remove_dir "${PORT_WINE_TMP_PATH}/dxvk_cache"
+    try_remove_dir "${PORT_WINE_TMP_PATH}/gl_shader_cache"
+    try_remove_dir "${PORT_WINE_TMP_PATH}/mono"
+    try_remove_dir "${PORT_WINE_TMP_PATH}/gecko"
+    try_remove_file "${PORT_WINE_TMP_PATH}/scripts_update_notifier"
+    try_remove_file "${PORT_WINE_PATH}/data/user.conf"
+    echo 1000 > "${PORT_WINE_TMP_PATH}/scripts_ver"
+    echo
+    echo "Restarting PP for reinstall files..."
+    /usr/bin/env bash -c ${pw_full_command_line[*]} &
+    exit 0
+}
+
 check_user_conf () {
    if [ ! -f "${USER_CONF}" ]; then
        echo "#!/usr/bin/env bash" > "${USER_CONF}"
--- a/data_from_portwine/scripts/lang
+++ b/data_from_portwine/scripts/lang
@@ -7,6 +7,7 @@ export update_loc=${update_loc}
 if [ "${update_loc}" = "RUS" ]
 then

+	export loc_gui_pw_reinstall_pp="Переустановить PORTPROTON"
    export loc_gui_rm_pp="Удалить PORTPROTON"
    export loc_gui_upd_pp="Проверить обновления"
    export loc_gui_changelog="История изменений"
@@ -52,6 +53,8 @@ then
 	export port_del1="Удаление $portname"
 	export port_del2="Вы действительно хотите полностью удалить PortProton?"

+	export port_reinstall="Вы действительно хотите переустановить PortProton?\nДля этого будет необходимо интернет соединение."
+
 	export port_deb1="PortWINE был запущен в режиме создания ${portname}.log и он успешно сохранен в корне каталога порта"
 	export port_deb2="Для диагностики проблемы, скопируйте ВЕСЬ лог в соответствующий канал у нас на сервере дискорда: https://discord.gg/FTaheP99wE"

@@ -144,6 +147,7 @@ then
    export loc_gui_edit_usc="EDIT USER.CONF"
    export loc_gui_scripts_fb="SCRIPTS FROM BACKUP"
    export loc_gui_credits="CREDITS"
+	export loc_gui_pw_reinstall_pp="REINSTALL PORTPROTON"

 	export loc_tray_winefile="WINEFILE"
 	export loc_tray_tascmng="TASKMNR"
@@ -181,8 +185,10 @@ then

 	export port_del1="Remove $portname"
 	export port_del2="Are you sure you want to delete the PortProton"
-	export port_deb1="PortWINE was launched in creation mode ${portname}.log and it is successfully stored in the root directory of the port"
+	
+	export port_reinstall="Do you really want to reinstall PortProton?\nFor this, an internet connection will be required."

+	export port_deb1="PortWINE was launched in creation mode ${portname}.log and it is successfully stored in the root directory of the port"
 	export port_deb2="To diagnose the problem, copy ALL of the log to discord server: https://discord.gg/FTaheP99wE"

 	export port_start1="Starting the PortWINE"
--- a/data_from_portwine/scripts/portwine_db/setup
+++ b/data_from_portwine/scripts/portwine_db/setup
@@ -26,7 +26,7 @@ export PW_NO_WRITE_WATCH=0          # Disable support for memory write watches i
 #export PW_FORCE_USE_VSYNC=2         # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
 export PW_WINEDBG_DISABLE=1
 export PW_USE_GAMEMODE=0             # Force disabele gamemod
-#export PW_FORCE_LARGE_ADDRESS_AWARE=0          # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
+export PW_FORCE_LARGE_ADDRESS_AWARE=0          # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 #export PULSE_LATENCY_MSEC=60
 export PW_DLL_INSTALL="mfc42 vcrun6sp6 vcrun2012 mfc120 mfc140 vcrun2013"
 #export LAUNCH_PARAMETERS="-d3d9"
--- a/data_from_portwine/scripts/runlib
+++ b/data_from_portwine/scripts/runlib
@@ -3,11 +3,15 @@
 # Development assistants: Cefeiko; Dezert1r; Taz_mania; Anton_Famillianov; gavr; RidBowt; chal55rus; UserDiscord
 ########################################################################
 echo '
-████─████─████─███─█───█─███─█──█─███
-█──█─█──█─█──█──█──█───█──█──██─█─█
-████─█──█─████──█──█─█─█──█──█─██─███
-█────█──█─█─█───█──█████──█──█──█─█
-█────████─█─█───█───█─█──███─█──█─███
+            █░░ █ █▄░█ █░█ ▀▄▀ ▄▄ █▀▀ ▄▀█ █▀▄▀█ █ █▄░█ █▀▀ ░ █▀█ █░█
+            █▄▄ █ █░▀█ █▄█ █░█ ░░ █▄█ █▀█ █░▀░█ █ █░▀█ █▄█ ▄ █▀▄ █▄█
+
+██████╗░░█████╗░██████╗░████████╗██████╗░██████╗░░█████╗░████████╗░█████╗░███╗░░██╗
+██╔══██╗██╔══██╗██╔══██╗╚══██╔══╝██╔══██╗██╔══██╗██╔══██╗╚══██╔══╝██╔══██╗████╗░██║
+██████╔╝██║░░██║██████╔╝░░░██║░░░██████╔╝██████╔╝██║░░██║░░░██║░░░██║░░██║██╔██╗██║
+██╔═══╝░██║░░██║██╔══██╗░░░██║░░░██╔═══╝░██╔══██╗██║░░██║░░░██║░░░██║░░██║██║╚████║
+██║░░░░░╚█████╔╝██║░░██║░░░██║░░░██║░░░░░██║░░██║╚█████╔╝░░░██║░░░╚█████╔╝██║░╚███║
+╚═╝░░░░░░╚════╝░╚═╝░░╚═╝░░░╚═╝░░░╚═╝░░░░░╚═╝░░╚═╝░╚════╝░░░░╚═╝░░░░╚════╝░╚═╝░░╚══╝

 '
 if [[ $(id -u) = 0 ]] ; then
@@ -529,7 +533,7 @@ start_portwine () {
        pw_start_progress_bar_cover "${PW_GUI_ICON_PATH}/covers/pw_loading_cover.gif"
    fi
    if [[ "${PW_PREFIX_NAME}" == "DOTNET" ]] && [[ "${PW_VULKAN_USE}" == "1" || "${PW_VULKAN_USE}" == "2" ]] ; then
-        var_winedlloverride_update "libglesv2=d"
+        var_winedlloverride_update "libglesv2="
    fi
    add_in_start_portwine
 }
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 # Author: linux-gaming.ru
+clear
 export NO_AT_BRIDGE=1
 export pw_full_command_line=("$0" $*)
 if [ -f "$1" ]; then
@@ -442,7 +443,7 @@ export -f gui_credits
 ###MAIN###

 # HOTFIX WGC TO LGC
-if [[ ! -z "$(echo ${1} | grep wgc_api.exe)" ]] && [[ ! -f "${1}" ]] ; then
+if [[ ! -z "$(echo ${1} | grep 'wgc_api.exe')" ]] && [[ ! -f "${1}" ]] ; then
    export PW_YAD_SET=PW_LGC
    pw_autoinstall_from_db 
    exit 0
@@ -453,6 +454,30 @@ if [[ ! -z "$(echo ${1} | grep '/Caliber/')" ]] ; then
    export PW_WINE_USE=PROTON_STEAM_6.3-8
 fi

+# HOTFIX BATTLE.NET
+
+if [[ ! -z "$(echo ${1} | grep 'Battle.net')" ]] ; then
+    export PW_WINE_USE="$PW_PROTON_LG_VER"
+#     RUN_SETFATTR="${PW_WINELIB}/portable/bin/setfattr"
+#     if [[ -f "${RUN_SETFATTR}" ]] ; then
+#         "${RUN_SETFATTR}" -x user.DOSATTRIB "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/Program Files (x86)/Battle.net/Battle.net."*"/platforms/qwindows.dll" 2>/dev/null
+#     fi
+fi
+
+case "${1}" in
+    '--help' )
+        echo '
+usege: [--reinstall]'
+        echo '
+--reinstall                  reinstall portproton to default settings
+'
+        exit 0 ;;
+
+    '--reinstall' )
+        export PW_REINSTALL_FROM_TERMINAL=1
+        pw_reinstall_pp ;;
+esac
+
 PW_PREFIX_NAME="$(echo "${PW_PREFIX_NAME}" | sed -e s/[[:blank:]]/_/g)"
 PW_ALL_PREFIXES=$(ls "${PORT_WINE_PATH}/data/prefixes/" | sed -e s/"${PW_PREFIX_NAME}$"//g)
 export PW_PREFIX_NAME PW_ALL_PREFIXES
@@ -620,6 +645,7 @@ else

    export KEY=$RANDOM
    "${pw_yad_new}" --plug=${KEY} --tabnum=4 --columns=3 --align-buttons --form --separator=";" \
+    --field="   $loc_gui_pw_reinstall_pp"!""!"":"FBTN" '@bash -c "button_click gui_pw_reinstall_pp"' \
    --field="   $loc_gui_rm_pp"!""!"":"FBTN" '@bash -c "button_click gui_rm_portproton"' \
    --field="   $loc_gui_upd_pp"!""!"":"FBTN" '@bash -c "button_click gui_pw_update"' \
    --field="   $loc_gui_changelog"!""!"":"FBTN" '@bash -c "button_click open_changelog"' \
@@ -745,6 +771,7 @@ case "$PW_YAD_SET" in
    gui_open_user_conf) gui_open_user_conf ;;
    gui_wine_uninstaller) gui_wine_uninstaller ;;
    gui_rm_portproton) gui_rm_portproton ;;
+    gui_pw_reinstall_pp) pw_reinstall_pp ;;
    gui_pw_update) gui_pw_update ;;
    gui_proton_downloader) gui_proton_downloader ;;
    gui_open_scripts_from_backup) gui_open_scripts_from_backup ;;
--- 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=2138
+#SCRIPTS_NEXT_VERSION=2139
 ########################################################################
 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
@@ -34,7 +34,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-32"
+export PW_LG_VER="7-34"
 export PW_PROTON_LG_VER="PROTON_LG_${PW_LG_VER}"
 ###WINE_PROTON_GE###
 export PW_GE_VER="7-37"