From 88ec0d7bb0dcc17d88e7661e2252ca0e55b83abd Mon Sep 17 00:00:00 2001
From: Mikhail Tergoev <fidel@altlinux.org>
Date: Sat, 10 Feb 2024 00:48:14 +0300
Subject: [PATCH] Scripts version 2253

---
 data_from_portwine/changelog_eng            |  3 +++
 data_from_portwine/changelog_rus            |  3 +++
 data_from_portwine/scripts/functions_helper | 24 ++++-----------------
 data_from_portwine/scripts/start.sh         | 14 ++++++------
 data_from_portwine/scripts/var              |  2 +-
 5 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng
index bb46ea1a..59ce63cb 100755
--- a/data_from_portwine/changelog_eng
+++ b/data_from_portwine/changelog_eng
@@ -2,6 +2,9 @@ You can help us in the development of the project on the website: https://linux-
 ----------------------------------------
 Changelog:
 
+###Scripts version 2253### Date: 10.02.2024 / Download update size: 8 megabytes
+* minor fixes for SteamOS
+
 ###Scripts version 2252### Date: 09.02.2024 / Download update size: 33 megabytes
 * GUI has been completely translated from zenity to yad
 * download from wget has been switched to curl (improved download stability with some providers)
diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus
index 9f58e77e..2d0ae119 100755
--- a/data_from_portwine/changelog_rus
+++ b/data_from_portwine/changelog_rus
@@ -2,6 +2,9 @@
 -----------------------------------------
 История изменений:
 
+###Scripts version 2253### Дата: 10.02.2024 / Размер скачиваемого обновления: 8 мегабайт
+* небольшие улучшения для SteamOS
+
 ###Scripts version 2252### Дата: 09.02.2024 / Размер скачиваемого обновления: 33 мегабайт
 * интерфейс полностью переведен с zenity на yad
 * скачивание с wget переведено на curl (для улучшения стабильности скачивания с некоторыми провайдерами)
diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index 0d1f0158..e51368ee 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -459,22 +459,6 @@ init_wine_ver () {
     return 0
 }
 
-pw_use_command () {
-    if command -v "$1" $>/dev/null ; then
-        $@
-    else
-        if [[ -f "${PW_PLUGINS_PATH}/portable/bin/${1}" ]] ; then
-            if [ ! -z "$LD_LIBRARY_PATH" ]
-            then env LD_LIBRARY_PATH="${PW_PLUGINS_PATH}/portable/lib/lib64:$LD_LIBRARY_PATH" "${PW_PLUGINS_PATH}/portable/bin/"$@ 
-            else env LD_LIBRARY_PATH="${PW_PLUGINS_PATH}/portable/lib/lib64" "${PW_PLUGINS_PATH}/portable/bin/"$@ 
-            fi
-        else
-            print_error "command $1 - not found"
-            exit 1
-        fi
-    fi
-}
-
 pw_init_runtime () {
 
     if grep -q -E '(ROSA Fresh|RED OS)' "/etc/os-release" ; then
@@ -885,7 +869,7 @@ pw_check_and_download_plugins () {
             fi
         else
             PW_NOTIFY_TEXT="Please wait for update PortProton"
-            pw_notify_send -u normal 
+            pw_notify_send -u critical 
             if try_download_silent "github.com/Castro-Fidel/wine_builds/releases/download/plugins${PW_PLUGINS_VER}/plugins${PW_PLUGINS_VER}.tar.xz" "${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}.tar.xz" ; then
                 if unpack_tar_xz "${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}.tar.xz" "${PORT_WINE_TMP_PATH}" ; then
                     try_remove_file "${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}.tar.xz" 
@@ -1158,11 +1142,11 @@ pw_create_gui_png () {
     if [[ ! -f "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png" ]] ; then
         try_remove_dir "${PORT_WINE_TMP_PATH}/tmp_img"
         create_new_dir "${PORT_WINE_TMP_PATH}/tmp_img"
-        pw_use_command wrestool -x --output="${PORT_WINE_TMP_PATH}/tmp_img/" -t14 "$(readlink -f "${portwine_exe}")"
+        env LD_LIBRARY_PATH="${PW_PLUGINS_PATH}/portable/lib/lib64" "${PW_PLUGINS_PATH}/portable/bin/wrestool" -x --output="${PORT_WINE_TMP_PATH}/tmp_img/" -t14 "$(readlink -f "${portwine_exe}")"
         cp "$(ls -S -1 "${PORT_WINE_TMP_PATH}/tmp_img/"*".ico" | head -n 1)" "${PORT_WINE_TMP_PATH}/tmp_img/${PORTPROTON_NAME}.ico"
-        pw_use_command icotool -x --width=${PW_RESIZE_TO} --height=${PW_RESIZE_TO} --output="${PORT_WINE_TMP_PATH}/tmp_img/" "${PORT_WINE_TMP_PATH}/tmp_img/${PORTPROTON_NAME}.ico"
+        env LD_LIBRARY_PATH="${PW_PLUGINS_PATH}/portable/lib/lib64" "${PW_PLUGINS_PATH}/portable/bin/icotool" -x --width=${PW_RESIZE_TO} --height=${PW_RESIZE_TO} --output="${PORT_WINE_TMP_PATH}/tmp_img/" "${PORT_WINE_TMP_PATH}/tmp_img/${PORTPROTON_NAME}.ico"
         if [[ ! -f "$(ls -S -1 "${PORT_WINE_TMP_PATH}/tmp_img/"*".png" | grep "${PW_RESIZE_TO}x${PW_RESIZE_TO}")" ]] ; then 
-            pw_use_command icotool -x --output="${PORT_WINE_TMP_PATH}/tmp_img/" "${PORT_WINE_TMP_PATH}/tmp_img/${PORTPROTON_NAME}.ico"
+            env LD_LIBRARY_PATH="${PW_PLUGINS_PATH}/portable/lib/lib64" "${PW_PLUGINS_PATH}/portable/bin/icotool" -x --output="${PORT_WINE_TMP_PATH}/tmp_img/" "${PORT_WINE_TMP_PATH}/tmp_img/${PORTPROTON_NAME}.ico"
             cp "$(ls -S -1 "${PORT_WINE_TMP_PATH}/tmp_img/"*".png" | head -n 1)" "${PORT_WINE_TMP_PATH}/tmp_img/${PORTPROTON_NAME}.png"
         else
             cp "$(ls -S -1 "${PORT_WINE_TMP_PATH}/tmp_img/"*".png" | grep "${PW_RESIZE_TO}x${PW_RESIZE_TO}" | head -n 1)" "${PORT_WINE_TMP_PATH}/tmp_img/${PORTPROTON_NAME}.png"
diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh
index 182fb60c..46c12e8f 100755
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -33,13 +33,13 @@ fi
 
 [[ "$MISSING_DESKTOP_FILE" == 1 ]] && portwine_missing_shortcut
 
-if [[ -f "$portwine_exe" ]] \
-&& [[ "${WARN_CYRILLIC_IN_PATH}" != 1 ]] \
-&& echo "${portwine_exe}" | grep -e $'[\u0430-\u044F\u0410-\u042F]' &>/dev/null
-then
-    yad_info "$loc_warn_cyrillic_in_path"
-    export WARN_CYRILLIC_IN_PATH="1"
-fi
+# if [[ -f "$portwine_exe" ]] \
+# && [[ "${WARN_CYRILLIC_IN_PATH}" != 1 ]] \
+# && echo "${portwine_exe}" | grep -e $'[\u0430-\u044F\u0410-\u042F]' &>/dev/null
+# then
+#     yad_info "$loc_warn_cyrillic_in_path"
+#     export WARN_CYRILLIC_IN_PATH="1"
+# fi
 
 if [[ -f "${PORT_WINE_TMP_PATH}/tmp_main_gui_size" ]] && [[ ! -z "$(cat ${PORT_WINE_TMP_PATH}/tmp_main_gui_size)" ]] ; then
     export PW_MAIN_SIZE_W="$(cat ${PORT_WINE_TMP_PATH}/tmp_main_gui_size | awk '{print $1}')"
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index accc6d32..eab98db2 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=2252
+#SCRIPTS_NEXT_VERSION=2253
 ########################################################################
 export PW_MANGOHUD="0"
 export DEFAULT_MANGOHUD_CONFIG="cpu_stats,cpu_temp,cpu_mhz,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,vram,ram,frame_timing=1,time,arch,wine,toggle_hud=Shift_R+F12,resolution,vkbasalt,gamemode"