From 8d9e8b8ce3fb25380f9d3f777c3158e74b6b8ae2 Mon Sep 17 00:00:00 2001
From: castro-fidel <tergoevm@gmail.com>
Date: Thu, 13 Jan 2022 19:52:27 +0300
Subject: [PATCH] Scripts 2060

---
 data_from_portwine/changelog        |  4 +++-
 data_from_portwine/scripts/setup.sh |  3 ++-
 data_from_portwine/scripts/var      |  2 +-
 portwine_install_script/portproton  | 14 ++++++++------
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/data_from_portwine/changelog b/data_from_portwine/changelog
index 16e67c8b..99e83861 100755
--- a/data_from_portwine/changelog
+++ b/data_from_portwine/changelog
@@ -10,9 +10,11 @@
 * добавить проверку количества db файлов на один exe
 * заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru
 -----------------------------------------
+###Scripts version 2060###
+* подготовлена возможность установки PortProton из репозиториев
+
 ###Scripts version 2059###
 * обновлена автоустановка GOG
-* 
 
 ###Scripts version 2058###
 * по умочанию выбран PW_WINE_USE=PROTON_STEAM для EGS
diff --git a/data_from_portwine/scripts/setup.sh b/data_from_portwine/scripts/setup.sh
index 5d8cd765..76f79f46 100755
--- a/data_from_portwine/scripts/setup.sh
+++ b/data_from_portwine/scripts/setup.sh
@@ -33,7 +33,8 @@ chmod u+x "${PORT_WINE_PATH}/${name_desktop}.desktop"
 if [ "${PW_SILENT_INSTALL}" = "1" ] ; then
 	if [ "${PW_AUTOPLAY}" = "1" ] ; then
 		unset INSTALLING_PORT
-		sh "$HOME/PortWINE/PortProton/data/scripts/start.sh" $@ & exit 0
+		ln -s "${XDG_DATA_HOME}/PortWINE" "${HOME}/"
+		sh "${XDG_DATA_HOME}/PortWINE/PortProton/data/scripts/start.sh" $@ & exit 0
 	else
 		echo "Installation completed successfully."
 	fi
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index ba7345ea..4a9eeb3d 100755
--- a/data_from_portwine/scripts/var
+++ b/data_from_portwine/scripts/var
@@ -1,6 +1,6 @@
 #!/bin/bash
 #Author: Castro-Fidel (PortWINE-Linux.ru)
-#SCRIPTS_NEXT_VERSION=2059
+#SCRIPTS_NEXT_VERSION=2060
 #PORT_NEXT_VERSION=97
 ########################################################################
 export PW_MANGOHUD=1
diff --git a/portwine_install_script/portproton b/portwine_install_script/portproton
index 2182a261..c2897c26 100755
--- a/portwine_install_script/portproton
+++ b/portwine_install_script/portproton
@@ -11,10 +11,15 @@ clear && echo '
 '
 ########################################################################
 unset PW_AUTOPLAY PW_SET_LANG PW_SILENT_INSTALL
+export portname="PortProton"
+export port_ver=97
+########################################################################
+deflink="${HOME}/PortWINE/${portname}"
 [ $(id -u) -eq 0 ] && echo "Do not run the script from the superuser!" && zenity --error --text "Do not run the script from the superuser!" 2> /dev/null  && exit 1
 if [ "$(dirname "`readlink -f "$0"`")" == "/usr/bin" ] ; then
-	if [ -f "$HOME/PortWINE/PortProton/data/scripts/start.sh" ] ; then
-		sh "$HOME/PortWINE/PortProton/data/scripts/start.sh" $@ & exit 0
+	[ -z "${XDG_DATA_HOME}" ] && export XDG_DATA_HOME="$HOME/.local/share"
+	if [ -f "${XDG_DATA_HOME}/PortWINE/PortProton/data/scripts/start.sh" ] ; then
+		sh "${XDG_DATA_HOME}/PortWINE/PortProton/data/scripts/start.sh" $@ & exit 0
 	else
 		if [ ! -z "`locale | grep "LANG=ru_RU.UTF-8"`" ] ; then 
 			PW_SET_LANG="Russian"
@@ -23,12 +28,10 @@ if [ "$(dirname "`readlink -f "$0"`")" == "/usr/bin" ] ; then
 		fi
 		export PW_SILENT_INSTALL="1"
 		export PW_AUTOPLAY=1
+		deflink="${XDG_DATA_HOME}/PortWINE/${portname}"
 	fi
 fi
 ########################################################################
-export portname="PortProton"
-export port_ver=97
-########################################################################
 export INSTALLING_PORT=1
 export PROGS_INST=""
 export vexit=0
@@ -45,7 +48,6 @@ fi
 ########################################################################
 cd "$(dirname "`readlink -f "$0"`")"
 links="$(pwd)"
-deflink="${HOME}/PortWINE/${portname}"
 ########################################################################
 if [ "$1" = "-rus" ] ; then
 	PW_SET_LANG="Russian"