From ecb4dc9934089dd811776b3adfff4cce207be55e Mon Sep 17 00:00:00 2001
From: Mikhail Tergoev <fidel@altlinux.org>
Date: Fri, 12 Jul 2024 16:38:05 +0300
Subject: [PATCH] Scripts version 2315

---
 data_from_portwine/changelog_en             |  6 ++++++
 data_from_portwine/changelog_ru             |  4 +++-
 data_from_portwine/scripts/functions_helper |  9 ++++-----
 data_from_portwine/scripts/start.sh         | 10 ++++++++--
 data_from_portwine/scripts/var              |  2 +-
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en
index 6786bd67..bad85c1a 100755
--- a/data_from_portwine/changelog_en
+++ b/data_from_portwine/changelog_en
@@ -2,6 +2,12 @@ You can help us in the development of the project on the website: https://linux-
 ----------------------------------------
 Changelog:
 
+###Scripts version 2315### Date: 12.07.2024 / Download update size: 4 megabytes
+* fixed the display of the PROTON_LG and WINE_LG versions in the absence of a settings file (thanks Htylol)
+* added the ability to run debugging scripts from the terminal: portproton --debug (thanks to Boria138 and Htylol)
+* fixed saving settings when launching shortcuts from the main menu
+* fixed creation of shortcuts after installing the game/app from setup.exe
+
 ###Scripts version 2314### Date: 11.07.2024 / Download update size: 4 megabytes
 * HOTFIX - create multiple shortcuts when unpacking a prefix backup
 * fixed the disable of CAS in the vkBasalt menu (0 in the menu is -1 in the variable)
diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru
index 856ad8e7..4e9e9c45 100755
--- a/data_from_portwine/changelog_ru
+++ b/data_from_portwine/changelog_ru
@@ -2,9 +2,11 @@
 -----------------------------------------
 История изменений:
 
+###Scripts version 2315### Дата: 12.07.2024 / Размер скачиваемого обновления: 4 мегабайта
 * исправлено отображение версии PROTON_LG и WINE_LG при отсутствии файла настроек (спасибо Htylol)
-* добавлена возможность запуска из терминала: portproton --debug (спасибо Boria138 и Htylol)
+* добавлена возможность запуска отладки скриптов из терминала: portproton --debug (спасибо Boria138 и Htylol)
 * исправлено сохранение настроек при запуске ярлыков из основного меню
+* исправлено создание ярлыков после установки игры/приложения из setup.exe
 
 ###Scripts version 2314### Дата: 11.07.2024 / Размер скачиваемого обновления: 4 мегабайта
 * HOTFIX - создание нескольких ярлыков при распаковке резервной копии префикса
diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index d283b20a..9ddd404f 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -1278,9 +1278,10 @@ pw_init_db () {
             fi
 
             IFS="$orig_IFS"
+            # shellcheck source=/dev/null
+            source "${PORTWINE_DB_FILE}"
             if [[ -f "${PW_FIND_DB_FILE}" ]] \
             && [[ "${PW_DISABLED_CREATE_DB}" != 1 ]] \
-            && grep "^export PW_DISABLED_CREATE_DB=1" "${PW_FIND_DB_FILE}" &>/dev/null
             then
                 try_copy_file "${PW_FIND_DB_FILE}" "${portwine_exe}".ppdb
                 PORTWINE_DB_FILE="${portwine_exe}".ppdb
@@ -1469,7 +1470,7 @@ update_winetricks () {
 }
 
 edit_db_from_gui () {
-    if [[ "${PW_DISABLED_CREATE_DB}" == 1 ]] ; then
+    if [[ "${PW_DISABLED_CREATE_DB}" == "1" ]] ; then
         print_warning "Skipped edit_db_from_gui"
         return 0
     fi
@@ -4411,11 +4412,9 @@ portwine_create_shortcut () {
     export GDK_BACKEND="x11"
     pw_stop_progress_bar
     [[ ! -e ${portwine_exe} ]] && return 1
+    unset PORTPROTON_NAME
     pw_create_gui_png
 
-print_error "portwine_exe: $portwine_exe"
-print_error "PORTPROTON_NAME: ${PORTPROTON_NAME}"
-
     if [[ "$1" == "block_name" ]] ; then
         export name_desktop="${PORTPROTON_NAME}"
         OUTPUT=$("${pw_yad}" --title="$(gettext "Choices")" --form \
diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh
index 943ff919..13a0f0ea 100755
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -374,8 +374,9 @@ use: [--reinstall] [--autoinstall]
         exit 0 ;;
 
     '--debug' )
+        clear
         export PW_DEBUG="set -x"
-        /usr/bin/env bash -c "${PORT_WINE_PATH}/data/scripts/start.sh"
+        /usr/bin/env bash -c ${pw_full_command_line[*]} 2>&1 | tee "$PORT_WINE_PATH/scripts.log" &
         exit 0 ;;
 esac
 
@@ -431,7 +432,12 @@ case "${PW_VULKAN_USE}" in
     *) PW_DEFAULT_VULKAN_USE="$SORT_NEWEST!$SORT_STABLE!$SORT_LEGACY!$SORT_G_ZINK!$SORT_G_NINE!$SORT_OPENGL!$SORT_VULKAN" ;;
 esac
 
-[[ -z "${PW_COMMENT_DB}" ]] && PW_COMMENT_DB="$(gettext "Launching") <b>${PORTWINE_DB}</b>."
+if [[ ! -z "${PW_COMMENT_DB}" ]] ; then :
+elif  [[ ! -z "${PORTPROTON_NAME}" ]] ; then
+    PW_COMMENT_DB="$(gettext "Launching") <b>${PORTPROTON_NAME}</b>"
+else
+    PW_COMMENT_DB="$(gettext "Launching") <b>${PORTWINE_DB}</b>"
+fi
 
 if [[ $PW_WINE_USE == PROTON_LG ]] ; then
     PW_WINE_USE="${PW_PROTON_LG_VER}"
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index ce61ec40..2e028a7e 100755
--- 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=2314
+#SCRIPTS_NEXT_VERSION=2315
 ########################################################################
 export LANGUAGES_LIST="ru es"
 export PW_VKBASALT="0"