Compare commits

...

7 Commits

Author SHA1 Message Date
Mikhail Tergoev
60a277fb52 Scripts version 2396 2025-03-04 20:59:34 +03:00
Mikhail Tergoev
45eeed07bf force create dir: steam_scripts 2025-03-04 20:44:05 +03:00
Mikhail Tergoev
99f14d2e08 Merge branch 'Htylol-fixed-exiftool' into devel 2025-03-04 20:28:14 +03:00
Mikhail Tergoev
d35d9bda56 Merge branch 'fixed-exiftool' of github.com:Htylol/PortWINE into Htylol-fixed-exiftool 2025-03-04 20:27:44 +03:00
Htylol
66f75ae65a Fixed scripts for PORTPROTON_NAME, name_desktop_png, PW_ICON_FOR_YAD 2025-03-04 16:04:50 +05:00
Mikhail Tergoev
a97f9aa9ac fix typos 2025-03-03 19:00:26 +03:00
Mikhail Tergoev
ff400ff8f6 added GST_DEBUG=ERROR for DEBUG mode 2025-03-03 18:40:25 +03:00
6 changed files with 41 additions and 35 deletions

@ -2,6 +2,11 @@ You can help us in the development of the project on the website: https://linux-
----------------------------------------
Changelog:
###Scripts version 2396### / Date: 04.03.2025 / Download update size: 4 megabytes
* fixed exiftool operation in flatpak version of PortProton (thanks to Boria138)
* fixed extra exiftool launches when switching from game menu to main menu and back (thanks to Htylol)
* added "GST_DEBUG=ERROR" for debug mode
###Scripts version 2395### / Date: 28.02.2025 / Download update size: 190 megabytes
* updated WINE_LG to version "10-1"
* fixed MANGOHUD for OpenGL in flatpak version of PortProton (thanks to Htylol and Boria138)

@ -2,6 +2,11 @@
-----------------------------------------
История изменений:
###Scripts version 2396### / Дата: 04.03.2025 / Размер скачиваемого обновления: 4 мегабайта
* исправлена работа exiftool во flatpak версии PortProton (спасибо Boria138)
* исправлены лишние запуски exiftool при переходе из меню игры в главное меню и обратно (спасибо Htylol)
* добавлен "GST_DEBUG=ERROR" для режима создания лога
###Scripts version 2395### / Дата: 28.02.2025 / Размер скачиваемого обновления: 190 мегабайт
* обновлен WINE_LG до версии "10-1"
* исправлена работа MANGOHUD для OpenGL во flatpak версии PortProton (спасибо Htylol и Boria138)

@ -2928,23 +2928,31 @@ edit_user_conf_from_gui () {
}
pw_create_gui_png () {
unset PORTPROTON_NAME name_desktop_png
basename_portwine_exe="$(basename "${portwine_exe}")"
if echo "$basename_portwine_exe" | grep -ie 'setup\|install\|\.msi$' &>/dev/null ; then
export PW_ICON_FOR_YAD="${PORT_WINE_PATH}/data/img/setup.png"
export name_desktop_png="setup"
return 0
elif echo "$basename_portwine_exe" | grep -ie '\.reg$' &>/dev/null ; then
export PW_ICON_FOR_YAD="${PORT_WINE_PATH}/data/img/reg.png"
export name_desktop_png="reg"
return 0
elif echo "$basename_portwine_exe"| grep -ie '\.bat$' &>/dev/null ; then
export PW_ICON_FOR_YAD="${PORT_WINE_PATH}/data/img/bat.png"
export name_desktop_png="bat"
return 0
if [[ -z $name_desktop_png ]] ; then
basename_portwine_exe="$(basename "${portwine_exe}")"
if echo "$basename_portwine_exe" | grep -ie 'setup\|install\|\.msi$' &>/dev/null ; then
export PW_ICON_FOR_YAD="${PORT_WINE_PATH}/data/img/setup.png"
export name_desktop_png="setup"
return 0
elif echo "$basename_portwine_exe" | grep -ie '\.reg$' &>/dev/null ; then
export PW_ICON_FOR_YAD="${PORT_WINE_PATH}/data/img/reg.png"
export name_desktop_png="reg"
return 0
elif echo "$basename_portwine_exe"| grep -ie '\.bat$' &>/dev/null ; then
export PW_ICON_FOR_YAD="${PORT_WINE_PATH}/data/img/bat.png"
export name_desktop_png="bat"
return 0
fi
name_desktop_png="${PORTPROTON_NAME// /_}"
if [[ $name_desktop_png =~ [\!\%\$\&\<] ]] ; then
local ICON_NAME_REGEX=(\! % \$ \& \<)
for i in "${ICON_NAME_REGEX[@]}" ; do
name_desktop_png="${name_desktop_png//$i/}"
done
fi
fi
if [[ -z "$PORTPROTON_NAME" ]] \
|| [[ -z "$FILE_DESCRIPTION" ]] \
|| [[ "$PW_NO_RESTART_PPDB" == "1" ]]
then
if [[ -n "${PORTWINE_CREATE_SHORTCUT_NAME}" ]] ; then
@ -3159,6 +3167,7 @@ start_portwine () {
if [[ "${PW_LOG}" == 1 ]] \
|| [[ -n "$PW_DEBUG" ]]
then
check_variables GST_DEBUG "ERROR"
check_variables WINEDEBUG "err+all"
check_variables WINE_MONO_TRACE "E:System.NotImplementedException"
check_variables VKBASALT_LOG_LEVEL "error"
@ -6197,14 +6206,6 @@ portwine_create_shortcut () {
create_name_desktop
export name_desktop="$PW_NAME_DESKTOP_PROXY"
[[ -z "${name_desktop_png}" ]] && name_desktop_png="${PORTPROTON_NAME// /_}"
if [[ $name_desktop_png =~ [\!\%\$\&\<] ]] ; then
local ICON_NAME_REGEX=(\! % \$ \& \<)
for i in "${ICON_NAME_REGEX[@]}" ; do
name_desktop_png="${name_desktop_png//$i/}"
done
fi
OUTPUT=$("${pw_yad}" --title="${translations[Choices]}" --form \
--gui-type="settings-shortcut" \
--gui-type-box="${NOTEBOOK_GUI_TYPE_BOX}" --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" \
@ -6408,13 +6409,6 @@ portwine_change_shortcut () {
export name_desktop="$PW_NAME_DESKTOP_PROXY"
pw_create_gui_png
[[ -z "${name_desktop_png}" ]] && name_desktop_png="${PORTPROTON_NAME// /_}"
if [[ $name_desktop_png =~ [\!\%\$\&\<] ]] ; then
local ICON_NAME_REGEX=(\! % \$ \& \<)
for i in "${ICON_NAME_REGEX[@]}" ; do
name_desktop_png="${name_desktop_png//$i/}"
done
fi
OUTPUT=$("${pw_yad}" --title="${translations[Choices]}" --form \
--gui-type="settings-shortcut" \

@ -101,7 +101,7 @@ else
unset PW_GUI_DISABLED_CS
fi
unset MANGOHUD PW_NO_ESYNC PW_NO_FSYNC PW_VULKAN_USE WINEDLLOVERRIDES PW_NO_WRITE_WATCH PW_YAD_SET PW_ICON_FOR_YAD
unset MANGOHUD PW_NO_ESYNC PW_NO_FSYNC PW_VULKAN_USE WINEDLLOVERRIDES PW_NO_WRITE_WATCH PW_YAD_SET
unset PW_CHECK_AUTOINSTALL PW_VKBASALT_EFFECTS PW_VKBASALT_FFX_CAS PORTWINE_DB PORTWINE_DB_FILE RADV_PERFTEST
unset CHK_SYMLINK_FILE PW_MESA_GL_VERSION_OVERRIDE PW_VKD3D_FEATURE_LEVEL PATH_TO_GAME PW_START_DEBUG PORTPROTON_NAME PW_PATH
unset PW_PREFIX_NAME VULKAN_MOD PW_WINE_VER PW_ADD_TO_ARGS_IN_RUNTIME PW_GAMEMODERUN_SLR PW_WINE_CPU_TOPOLOGY
@ -158,6 +158,8 @@ cd "${PORT_SCRIPTS_PATH}" || fatal
source "${PORT_SCRIPTS_PATH}/var"
export STEAM_SCRIPTS="${PORT_WINE_PATH}/steam_scripts"
create_new_dir "$STEAM_SCRIPTS"
export PW_PLUGINS_PATH="${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}"
export PW_CACHE_LANG_PATH="${PORT_WINE_TMP_PATH}/cache_lang/"
export PW_GUI_ICON_PATH="${PORT_WINE_PATH}/data/img/gui"
@ -617,7 +619,7 @@ if [[ -f "$portwine_exe" ]] ; then
for db_unset in $PORTWINE_DB_FOR_UNSET ; do
unset "$db_unset"
done
unset portwine_exe KEY_START
unset portwine_exe KEY_START name_desktop_png PW_ICON_FOR_YAD
print_info "Restarting..."
restart_pp
;;

@ -1,6 +1,6 @@
#!/usr/bin/env bash
#Author: Castro-Fidel (linux-gaming.ru)
#SCRIPTS_NEXT_VERSION=2395
#SCRIPTS_NEXT_VERSION=2396
#SCRIPTS_STABLE_VERSION=2388
########################################################################
export AI_TOP_GAMES="PW_LGC PW_VKPLAY PW_EPIC PW_BATTLE_NET PW_WORLD_OF_SEA_BATTLE PW_RUSSIAN_FISHING PW_HO_YO_PLAY PW_FARLIGHT84 PW_WARFRAME PW_WGC PW_UBISOFT"

@ -42,8 +42,8 @@ export PW_TAB_POSITON=top
# количество столбцов в главном меню
export MAIN_GUI_COLUMNS=3
export START_GUI_NOTEBOOK_COLUMNS=3 # количество слолбцов для настроек в notebook
export START_GUI_PANED_COLUMNS=3 # количество слолбцов для настроек в paned
export START_GUI_NOTEBOOK_COLUMNS=3 # количество столбцов для настроек в notebook
export START_GUI_PANED_COLUMNS=3 # количество столбцов для настроек в paned
# это нужно
export START_GUI_TYPE="--gui-type=start \
--homogeneous-row \