xpamych/PortWINE
1
0
Fork 0
forked from CastroFidel/PortWINE
Code Pull Requests Activity

###Scripts version 2036###

Browse Source
This commit is contained in:
castro-fidel 2021-10-26 13:22:23 +03:00
parent 1e0d6fea99
commit b77e0b2ffa
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data_from_portwine/changelog
View File

@ -7,6 +7,10 @@
* добавить проверку количества db файлов на один exe * добавить проверку количества db файлов на один exe
* заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru * заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru
----------------------------------------- -----------------------------------------
###Scripts version 2036###
* улучшено скачивание с github
* исправлено отключение MANGOHUD из EDIT_DB
###Scripts version 2035### ###Scripts version 2035###
* в EDIT_DB добавлена возможность ограничения FPS * в EDIT_DB добавлена возможность ограничения FPS
* обновлеение winetricks происходит только при условии его последуещего использования (если не установлены какие-нибудь компоненты) * обновлеение winetricks происходит только при условии его последуещего использования (если не установлены какие-нибудь компоненты)

12
data_from_portwine/scripts/functions_helper
View File

@ -95,7 +95,7 @@ check_process () {
try_download () { try_download () {
set -o pipefail 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./' | \ 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 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 [ "${PIPESTATUS[0]}" != 0 ] && print_error "failed to download $1. Scipping." && return 1 || return 0
@ -103,14 +103,14 @@ try_download () {
try_download_to_path () { try_download_to_path () {
set -o pipefail 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./' | \ 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 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 [ "${PIPESTATUS[0]}" != 0 ] && print_error "failed to download $1. Scipping." && return 1 || return 0
} }
try_download_silent () { 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 [ "$?" != 0 ] && print_error "failed to download $1. Scipping." && return 1 || return 0
} }
@ -695,16 +695,14 @@ pw_gui_for_edit_db () {
done done
} }
edit_db_field_read $@ edit_db_field_read $@
edit_db_from_gui $@
FPS_LIMIT="`cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit"`" FPS_LIMIT="`cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit"`"
if [ "${FPS_LIMIT}" == 0 ] ; then 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 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 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 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 fi
edit_db_from_gui PW_MANGOHUD MANGOHUD_CONFIG edit_db_from_gui $@ MANGOHUD_CONFIG
# PW_DB_TMP=`cat "${PORTWINE_DB_FILE}"` # PW_DB_TMP=`cat "${PORTWINE_DB_FILE}"`
# echo "${PW_DB_TMP}" | awk '! a[$0]++' > "${PORTWINE_DB_FILE}" # echo "${PW_DB_TMP}" | awk '! a[$0]++' > "${PORTWINE_DB_FILE}"
# unset PW_DB_TMP # unset PW_DB_TMP

2
data_from_portwine/scripts/var
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
#Author: Castro-Fidel (PortWINE-Linux.ru) #Author: Castro-Fidel (PortWINE-Linux.ru)
#SCRIPTS_NEXT_VERSION=2035 #SCRIPTS_NEXT_VERSION=2036
#PORT_NEXT_VERSION=97 #PORT_NEXT_VERSION=97
######################################################################## ########################################################################
export PW_MANGOHUD=0 export PW_MANGOHUD=0