From 71cad8a5bac981f47cc313eb1296d2850a465d66 Mon Sep 17 00:00:00 2001
From: Mikhail Tergoev <fidel@altlinux.org>
Date: Fri, 12 Jul 2024 15:38:49 +0300
Subject: [PATCH] fix TPM for backup

---
 data_from_portwine/changelog_ru             |  3 +++
 data_from_portwine/scripts/functions_helper |  8 ++++----
 data_from_portwine/scripts/start.sh         | 16 ++++++++--------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru
index c45340e..2e8bd9f 100755
--- a/data_from_portwine/changelog_ru
+++ b/data_from_portwine/changelog_ru
@@ -2,6 +2,9 @@
 -----------------------------------------
 История изменений:
 
+* исправлено отображение версии PROTON_LG и WINE_LG при отсутствии файла настроек (спасибо Htylol)
+* добавлена возможность запуска из терминала: portproton --debug (спасибо Boria138 и Htylol)
+
 ###Scripts version 2314### Дата: 11.07.2024 / Размер скачиваемого обновления: 4 мегабайта
 * HOTFIX - создание нескольких ярлыков при распаковке резервной копии префикса
 * исправлено полное отключение CAS в меню vkBasalt (0 в меню равно -1 в переменной)
diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index 2b17118..0e88639 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -4876,15 +4876,15 @@ pw_create_prefix_backup () {
     else TMP_ALL_PATH="LD_LIBRARY_PATH=\"${PW_LD_LIBRARY_PATH}\""
     fi
     chmod -R u+w "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"
-cat << EOF > "${PW_TMPFS_PATH}"/pp_pfx_backup.sh
+cat << EOF > "${PORT_WINE_TMP_PATH}"/pp_pfx_backup.sh
     #!/usr/bin/env bash
     ${TMP_ALL_PATH} mksquashfs "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}" \
     "${PW_PREFIX_TO_BACKUP}/${PW_PREFIX_NAME}.ppack.part" -comp zstd \
     || rm -f "${PW_PREFIX_TO_BACKUP}/${PW_PREFIX_NAME}.ppack.part"
 EOF
-    chmod u+x "${PW_TMPFS_PATH}"/pp_pfx_backup.sh
-    ${pw_runtime} ${PW_TERM} "${PW_TMPFS_PATH}"/pp_pfx_backup.sh
-    try_remove_file "${PW_TMPFS_PATH}"/pp_pfx_backup.sh
+    chmod u+x "${PORT_WINE_TMP_PATH}"/pp_pfx_backup.sh
+    ${pw_runtime} ${PW_TERM} "${PORT_WINE_TMP_PATH}"/pp_pfx_backup.sh
+    try_remove_file "${PORT_WINE_TMP_PATH}"/pp_pfx_backup.sh
     if [[ -f "${PW_PREFIX_TO_BACKUP}/${PW_PREFIX_NAME}.ppack.part" ]] ; then
         mv -f "${PW_PREFIX_TO_BACKUP}/${PW_PREFIX_NAME}.ppack.part" "${PW_PREFIX_TO_BACKUP}/${PW_PREFIX_NAME}.ppack"
         yad_info "$(gettext "Backup has been successfully created for prefix:") $PW_PREFIX_NAME"
diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh
index 9272c9e..ba98aa3 100755
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -312,20 +312,20 @@ if [[ ! -z $(basename "${portwine_exe}" | grep .ppack) ]] ; then
     else TMP_ALL_PATH="LD_LIBRARY_PATH=\"${PW_LD_LIBRARY_PATH}\""
     fi
     PW_PREFIX_NAME=$(basename "$1" | awk -F'.' '{print $1}')
-cat << EOF > "${PW_TMPFS_PATH}"/pp_pfx_unpack.sh
+cat << EOF > "${PORT_WINE_TMP_PATH}"/pp_pfx_unpack.sh
     #!/usr/bin/env bash
     ${TMP_ALL_PATH} unsquashfs -f -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}" "$1" \
-    || echo "ERROR" > "${PW_TMPFS_PATH}"/pp_pfx_unpack_error
+    || echo "ERROR" > "${PORT_WINE_TMP_PATH}"/pp_pfx_unpack_error
 EOF
-    chmod u+x "${PW_TMPFS_PATH}"/pp_pfx_unpack.sh
-    ${pw_runtime} ${PW_TERM} "${PW_TMPFS_PATH}"/pp_pfx_unpack.sh
-    if grep "ERROR" "${PW_TMPFS_PATH}"/pp_pfx_unpack_error &>/dev/null ; then
-        try_remove_file "${PW_TMPFS_PATH}"/pp_pfx_unpack_error
-        try_remove_file "${PW_TMPFS_PATH}"/pp_pfx_unpack.sh
+    chmod u+x "${PORT_WINE_TMP_PATH}"/pp_pfx_unpack.sh
+    ${pw_runtime} ${PW_TERM} "${PORT_WINE_TMP_PATH}"/pp_pfx_unpack.sh
+    if grep "ERROR" "${PORT_WINE_TMP_PATH}"/pp_pfx_unpack_error &>/dev/null ; then
+        try_remove_file "${PORT_WINE_TMP_PATH}"/pp_pfx_unpack_error
+        try_remove_file "${PORT_WINE_TMP_PATH}"/pp_pfx_unpack.sh
         yad_error "$(gettext "Unpack has FAILED for prefix:") <b>\"${PW_PREFIX_NAME}\"</b>."
         exit 1
     else
-        try_remove_file "${PW_TMPFS_PATH}"/pp_pfx_unpack.sh
+        try_remove_file "${PORT_WINE_TMP_PATH}"/pp_pfx_unpack.sh
         if [[ -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.create_shortcut" ]] ; then
             while IFS= read -r line
             do