From b77e0b2ffab06a262d79377b38116485892cd93d Mon Sep 17 00:00:00 2001
From: castro-fidel <tergoevm@gmail.com>
Date: Tue, 26 Oct 2021 13:22:23 +0300
Subject: [PATCH] ###Scripts version 2036###

---
 data_from_portwine/changelog                |  4 ++++
 data_from_portwine/scripts/functions_helper | 12 +++++-------
 data_from_portwine/scripts/var              |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/data_from_portwine/changelog b/data_from_portwine/changelog
index d039f88..58972b8 100755
--- a/data_from_portwine/changelog
+++ b/data_from_portwine/changelog
@@ -7,6 +7,10 @@
 * добавить проверку количества db файлов на один exe
 * заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru
 -----------------------------------------
+###Scripts version 2036###
+* улучшено скачивание с github
+* исправлено отключение MANGOHUD из EDIT_DB
+
 ###Scripts version 2035###
 * в EDIT_DB добавлена возможность ограничения FPS
 * обновлеение winetricks происходит только при условии его последуещего использования (если не установлены какие-нибудь компоненты)
diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index f9dccfa..3eef19b 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -95,7 +95,7 @@ check_process () {
 
 try_download () {
     set -o pipefail
-    wget -c -t 5 -T 3 "$1" --output-document="$2" 2>&1 | \
+    wget --no-check-certificate --content-disposition -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
@@ -103,14 +103,14 @@ try_download () {
 
 try_download_to_path () {
     set -o pipefail
-    wget -c -t 5 -T 3 "$1" --directory-prefix="$2" 2>&1 | \
+    wget --no-check-certificate --content-disposition -c -t 5 -T 3 "$1" --directory-prefix="$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 -t 2 -T 10 "$1" --output-document="$2"
+    wget --no-check-certificate --content-disposition -t 2 -T 10 "$1" --output-document="$2"
     [ "$?" != 0 ] && print_error "failed to download $1. Scipping." && return 1 || return 0
 }
 
@@ -695,16 +695,14 @@ pw_gui_for_edit_db () {
         done
     }
     edit_db_field_read $@
-    edit_db_from_gui $@
-
     FPS_LIMIT="`cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit"`"
     if [ "${FPS_LIMIT}" == 0 ] ; then
         export MANGOHUD_CONFIG=font_size=24,position=top-left,toggle_hud=Shift_R+F12,no_display,resolution,wine,gpu_name,vulkan_driver,gpu_stats,vkbasalt
     else
         export MANGOHUD_CONFIG=font_size=24,position=top-left,toggle_hud=Shift_R+F12,no_display,resolution,wine,gpu_name,vulkan_driver,gpu_stats,vkbasalt,fps_limit=${FPS_LIMIT}
-        export PW_MANGOHUD=1
     fi
-    edit_db_from_gui PW_MANGOHUD MANGOHUD_CONFIG
+    edit_db_from_gui $@ MANGOHUD_CONFIG
+
     # PW_DB_TMP=`cat "${PORTWINE_DB_FILE}"`
     # echo "${PW_DB_TMP}" | awk '! a[$0]++' > "${PORTWINE_DB_FILE}"
     # unset PW_DB_TMP
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index 2a55cbf..699fc99 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=2035
+#SCRIPTS_NEXT_VERSION=2036
 #PORT_NEXT_VERSION=97
 ########################################################################
 export PW_MANGOHUD=0