From ad6fd6d8cbba4fe051ba13414b31c1d41b5961df Mon Sep 17 00:00:00 2001
From: castro-fidel <tergoevm@gmail.com>
Date: Sat, 16 Oct 2021 19:38:54 +0300
Subject: [PATCH] ###Scripts version 2021###

---
 data_from_portwine/changelog                          |  4 ++++
 data_from_portwine/scripts/functions_helper           |  4 ++--
 .../scripts/portwine_db/League of Legends             |  6 +++---
 data_from_portwine/scripts/portwine_db/hulk           |  9 ---------
 data_from_portwine/scripts/pw_autoinstall/PW_WGC      | 11 ++++++++++-
 data_from_portwine/scripts/runlib                     |  5 ++++-
 data_from_portwine/scripts/var                        |  2 +-
 7 files changed, 24 insertions(+), 17 deletions(-)
 delete mode 100644 data_from_portwine/scripts/portwine_db/hulk

diff --git a/data_from_portwine/changelog b/data_from_portwine/changelog
index c3d7c02..2105e52 100755
--- a/data_from_portwine/changelog
+++ b/data_from_portwine/changelog
@@ -7,6 +7,10 @@
 * добавить комментарии описывающие функционал скриптов и db файлов
 * заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru
 -----------------------------------------
+###Scripts version 2021###
+* HOTFIX - создание каталогов mono и gecko при первом запуске
+* Добавлена поддержка работы PortProton под ROSA FRESH R12 (необходимые зависимости опубликованы на сайте)
+
 ###Scripts version 2020###
 * HOTFIX - отрабатывания новой кнопки скачивания PROTON_GE
 
diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index b9ea380..689fea9 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -91,14 +91,14 @@ try_force_link_dir () {
 
 try_download () {
     set -o pipefail
-    wget -c -t 5 -T 2 "$1" --output-document="$2" 2>&1 | \
+    wget -c -t 5 -T 3 "$1" --output-document="$2" 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
     [ "${PIPESTATUS[0]}" != 0 ] && print_error "failed to download $1. Scipping." && return 1 || return 0
 }
 
 try_download_silent () {
-    wget -c -t 1 -T 20 "$1" --output-document="$2"
+    wget -t 2 -T 10 "$1" --output-document="$2"
     [ "$?" != 0 ] && print_error "failed to download $1. Scipping." && return 1 || return 0
 }
 
diff --git a/data_from_portwine/scripts/portwine_db/League of Legends b/data_from_portwine/scripts/portwine_db/League of Legends
index b827cb8..a317e5c 100755
--- a/data_from_portwine/scripts/portwine_db/League of Legends	
+++ b/data_from_portwine/scripts/portwine_db/League of Legends	
@@ -3,14 +3,14 @@
 #LeagueClient.exe
 #RiotClientServices.exe
 #Install League of Legends ru.exe
-#Install League of Legends nu.exe
+#Install League of Legends na.exe
 #Install League of Legends euw.exe
 #live.na.exe
 #Rating=1-5
 #####################examples###########################
 export TEXT_OPSSL=""
 [[ -z `which openssl` ]] && export TEXT_OPSSL="Install openssl in your system!!!\n"
-export PW_COMMENT_DB="${TEXT_OPSSL}Dwnload and start League of Legend can take a long time"
+export PW_COMMENT_DB="${TEXT_OPSSL}Dwnload and start League of Legends can take a long time"
 ##export PW_WINDOWS_VER=10                        # Set windows version 10, 7 or XP
 ##export PW_DLL_INSTALL="vcrun2017"               # Install DDL in port prefix (used winetricks)
 ##export WINEDLLOVERRIDES="blabla=n,b"
@@ -44,7 +44,7 @@ export PW_GECKO_VER="2.47.2"
 ##export PW_GUI_DISABLED_CS=1                     # 1 = disabled GUI
 
 check_port_for_lol () {
-    pw_start_progress_bar_block "Download and start League of Legend. Please wait. It can take a long time!"
+    pw_start_progress_bar_block "Download and start League of Legends. Please wait. It can take a long time!"
     process=LeagueClientUx.exe
     while [[ -z `pidof ${process}` ]] ; do
         echo "PID ${process} not found"
diff --git a/data_from_portwine/scripts/portwine_db/hulk b/data_from_portwine/scripts/portwine_db/hulk
deleted file mode 100644
index 7a99076..0000000
--- a/data_from_portwine/scripts/portwine_db/hulk
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-#Author: Сергей 33(46)
-#hulk.exe 
-#Rating=1-5
-################################################
-export PW_VULKAN_USE=0
-export PW_WINDOWS_VER="XP"
-export LAUNCH_PARAMETERS="-d3d9"
-export PW_WINE_USE=proton_steam
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_WGC b/data_from_portwine/scripts/pw_autoinstall/PW_WGC
index 21078b1..e986121 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_WGC
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_WGC
@@ -4,8 +4,17 @@
 export LAUNCH_PARAMETERS=("/VERYSILENT")
 [ "${update_loc}" = "RUS" ] && export WGC_LOC=RU || export WGC_LOC=EU
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Wargaming_Game_Center_Install_WoT_${WGC_LOC}.exe"
+
+try_download_wgc () {
+    set -o pipefail
+    wget -t 5 -T 3 "$1" --output-document="$2" 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
+    [ "${PIPESTATUS[0]}" != 0 ] && print_error "failed to download $1. Scipping." && return 1 || return 0
+}
+
 start_portwine
-if try_download "https://redirect.wargaming.net/WGC/Wargaming_Game_Center_Install_WoT_${WGC_LOC}.exe" "${PW_AUTOINSTALL_EXE}"
+if try_download_wgc "https://redirect.wargaming.net/WGC/Wargaming_Game_Center_Install_WoT_${WGC_LOC}.exe"  "${PW_AUTOINSTALL_EXE}"
 then
     pw_start_progress_bar_block "Starting WGC installation..."
     pw_kill_autostart wgc.exe &
diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib
index ff22a3e..0c2cb2d 100755
--- a/data_from_portwine/scripts/runlib
+++ b/data_from_portwine/scripts/runlib
@@ -471,7 +471,10 @@ if [ -d "${PORT_WINE_PATH}/data/dist" ] ; then
     done
     IFS="$orig_IFS"
 fi
-create_new_dir "${PORT_WINE_TMP_PATH}"
+
+create_new_dir "${PORT_WINE_TMP_PATH}"/gecko
+create_new_dir "${PORT_WINE_TMP_PATH}"/mono
+
 if [ -d "${HOME}/.PortWINE/" ] ; then
     try_remove_dir "${HOME}/.PortWINE/tmp"
     mv -f "${HOME}/.PortWINE"/* "${PORT_WINE_TMP_PATH}"
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index 5d0f060..6474a1e 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=2020
+#SCRIPTS_NEXT_VERSION=2021
 #PORT_NEXT_VERSION=97
 ########################################################################
 export PW_MANGOHUD=1