Merge branch 'Castro-Fidel:master' into update-lang

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 2230### Date: 10.11.2023 / Download update size: 8 megabytes
+* minor update
+
 ###Scripts version 2229### Date: 08.11.2023 / Download update size: 200 megabytes
 * updated PROTON_LG to version 8-22
 * updated versions:

data_from_portwine/changelog_rus

@@ -2,6 +2,9 @@
 -----------------------------------------
 История изменений:
 
+###Scripts version 2230### Дата: 10.11.2023 / Размер скачиваемого обновления: 8 мегабайт
+* подготовка к обновлению установoщика PortProton
+
 ###Scripts version 2229### Дата: 08.11.2023 / Размер скачиваемого обновления: 200 мегабайт
 * обновлен PROTON_LG до версии 8-22
 * обновлены версии:

data_from_portwine/scripts/runlib

@@ -689,7 +689,6 @@ export portname=PortProton
 cd "$(dirname "`readlink -f "$0"`")" && export PORT_SCRIPTS_PATH="$(pwd)"
 cd "${PORT_SCRIPTS_PATH}/../../" && export PORT_WINE_PATH="$(pwd)"
 export PORT_WINE_TMP_PATH="${PORT_WINE_PATH}/data/tmp"
-rm -f "${PORT_WINE_TMP_PATH}"/*.tar.*
 
 echo "" > "${PORT_WINE_TMP_PATH}/tmp_yad_form"
 
@@ -745,10 +744,6 @@ export install_ver=`cat "${PORT_WINE_TMP_PATH}/${portname}_ver" | head -n 1`
 export WINETRICKS_DOWNLOADER="curl"
 export USER_CONF="${PORT_WINE_PATH}/data/user.conf"
 check_user_conf
-# sed -i 's/ PP_/ PW_/g' "${USER_CONF}"
-if [[ ! -d "${HOME}/PortWINE" ]] && [[ -d  "${HOME}/.local/share/PortWINE/PortProton/" ]] ; then
-    ln -s "${HOME}/.local/share/PortWINE/" "${HOME}"
-fi
 
 if [[ -z "${INSTALLING_PORT}" ]] ; then
     . "${USER_CONF}"

data_from_portwine/scripts/setup.sh

@@ -23,8 +23,8 @@ update-desktop-database -q "${HOME}/.local/share/applications"
 xdg-mime default PortProton.desktop "application/x-ms-dos-executable;application/x-wine-extension-msp;application/x-msi;application/x-msdos-program"
 
 name_desktop="readme"
-echo "[Desktop Entry]"					 > "${PORT_WINE_PATH}/${name_desktop}.desktop"
-echo "Name=${name_desktop}"				>> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+echo "[Desktop Entry]"				 > "${PORT_WINE_PATH}/${name_desktop}.desktop"
+echo "Name=${name_desktop}"			>> "${PORT_WINE_PATH}/${name_desktop}.desktop"
 echo "Version=1.0"					>> "${PORT_WINE_PATH}/${name_desktop}.desktop"
 echo "Type=Link"					>> "${PORT_WINE_PATH}/${name_desktop}.desktop"
 echo "Icon="${PORT_WINE_PATH}/data/img/readme.png""	>> "${PORT_WINE_PATH}/${name_desktop}.desktop"
@@ -53,13 +53,13 @@ if [ "${PW_SILENT_INSTALL}" = "1" ] ; then
 				ln -s "${PW_OLD_PATH}/PortProton" "${XDG_DATA_HOME}/PortWINE"
 			fi
 		fi
-		if [ ! -L "${HOME}/PortWINE" ]; then
+		if [ ! -L "${HOME}/PortWINE" ] && [ -d "${XDG_DATA_HOME}/PortWINE" ] ; then
 		    ln -s "${XDG_DATA_HOME}/PortWINE" "${HOME}/"
 		else
 		    echo "Symbolic link already exists."
 		fi
 		echo "Restarting PP after installing..."
-		/usr/bin/env bash -c "${XDG_DATA_HOME}/PortWINE/PortProton/data/scripts/start.sh" $@ & 
+		/usr/bin/env bash -c "${PORT_WINE_PATH}/data/scripts/start.sh" $@ & 
 		exit 0
 	else
 		echo "Installation completed successfully."

data_from_portwine/scripts/var

 #!/usr/bin/env bash
 #Author: Castro-Fidel (linux-gaming.ru)
-#SCRIPTS_NEXT_VERSION=2229
+#SCRIPTS_NEXT_VERSION=2230
 ########################################################################
 export PW_MANGOHUD=0
 export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt