From 08d8b4eb3dd3fa41ac9fb591256d93b9f4c94c81 Mon Sep 17 00:00:00 2001
From: castro-fidel <tergoevm@gmail.com>
Date: Sat, 15 Jan 2022 22:35:02 +0300
Subject: [PATCH] update portproton installation script 4

---
 data_from_portwine/scripts/runlib     |   2 +-
 portwine_install_script/PortProton-97 |  39 +++---
 portwine_install_script/portproton    | 168 --------------------------
 3 files changed, 20 insertions(+), 189 deletions(-)
 delete mode 100755 portwine_install_script/portproton

diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib
index 0a895a9a..3dac761a 100755
--- a/data_from_portwine/scripts/runlib
+++ b/data_from_portwine/scripts/runlib
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Author: Castro-Fidel (PortWINE-Linux.ru)
-# Development assistants: Cefeiko; Dezert1r; Taz_mania; Anton_Famillianov; Rus_Nor; gavr; RidBowt; VHSgunzo; chal55rus
+# Development assistants: Cefeiko; Dezert1r; Taz_mania; Anton_Famillianov; gavr; RidBowt; chal55rus
 ########################################################################
 echo '
 ████─████─████─███─█───█─███─█──█─███
diff --git a/portwine_install_script/PortProton-97 b/portwine_install_script/PortProton-97
index 2182a261..b45d6536 100755
--- a/portwine_install_script/PortProton-97
+++ b/portwine_install_script/PortProton-97
@@ -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"
@@ -104,19 +106,16 @@ else
 	if [ $? -eq 1 ] ; then echo "error" && exit 1 ; fi
 fi
 ########################################################################
-if [ "${PW_SILENT_INSTALL}" != "1" ] ; then
-	case $PW_SET_LANG in
-		"Russian")
-			progress_bar() {
-			zenity --progress --title="Установка..." --text="Настройка ${portname}" --pulsate --auto-close --auto-kill --width=450 > /dev/null 2>&1 
-			} ;;
-		"English")
-			progress_bar() {
-			zenity --progress --title="Install..." --text="Install ${portname}" --pulsate --auto-close --auto-kill --width=450 > /dev/null 2>&1 
-			} ;;
-	esac
-	if [ $? -eq 1 ] ; then echo "error" && exit 1 ; fi
-fi
+case $PW_SET_LANG in
+	"Russian")
+		progress_bar() {
+		zenity --progress --title="Установка..." --text="Настройка ${portname}" --pulsate --auto-close --auto-kill --width=450 > /dev/null 2>&1 
+		} ;;
+	"English")
+		progress_bar() {
+		zenity --progress --title="Install..." --text="Install ${portname}" --pulsate --auto-close --auto-kill --width=450 > /dev/null 2>&1 
+		} ;;
+esac
 ########################################################################
 export PORT_WINE_PATH="${D_PATH}"
 if [ ! -d "${PORT_WINE_PATH}" ] ; then
@@ -157,7 +156,7 @@ try_download_scripts () {
 		try_download_scripts
 	fi
 }
-if [ "${PW_SILENT_INSTALL}" = "1" ] ; then
+if [ "${PW_SILENT_INSTALL}" = "1" ] & [ ! -f "/usr/bin/portproton" ] ; then
 	try_download_scripts
 else
 	try_download_scripts | progress_bar
diff --git a/portwine_install_script/portproton b/portwine_install_script/portproton
deleted file mode 100755
index b45d6536..00000000
--- a/portwine_install_script/portproton
+++ /dev/null
@@ -1,168 +0,0 @@
-#!/bin/bash
-# License GPL
-########################################################################
-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
-	[ -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"
-		else
-			PW_SET_LANG="English"
-		fi
-		export PW_SILENT_INSTALL="1"
-		export PW_AUTOPLAY=1
-		deflink="${XDG_DATA_HOME}/PortWINE/${portname}"
-	fi
-fi
-########################################################################
-export INSTALLING_PORT=1
-export PROGS_INST=""
-export vexit=0
-########################################################################
-for PROGS in "wget" "curl" "tar" "awk" "zenity" "cabextract" "pidof" ; do
-	if [ ! -x "`which "${PROGS}" 2>/dev/null`" ] ; then
-		PROGS_INST="${PROGS_INST} ${PROGS}" && vexit=1
-	fi
-done
-if [ "${vexit}" -eq "1" ] ; then
-    echo "You will need to install: ${PROGS_INST}, and restart the script"
-    exit 1
-fi
-########################################################################
-cd "$(dirname "`readlink -f "$0"`")"
-links="$(pwd)"
-########################################################################
-if [ "$1" = "-rus" ] ; then
-	PW_SET_LANG="Russian"
-	export PW_SILENT_INSTALL="1"
-elif [ "$1" = "-eng" ] ; then
-	PW_SET_LANG="English"
-	export PW_SILENT_INSTALL="1"
-elif [ -z "${PW_SET_LANG}" ] ; then
-	PW_SET_LANG=`zenity --title  "Install $portname" --text "Select the installation language" --list --radiolist \
---column="Set:" --column "Language:" \
-	TRUE "Russian" \
-	FALSE "English" ` 2> /dev/null  
-	if [ $? -eq 1 ] ; then exit 1 ; fi
-	case $PW_SET_LANG in
-		"Russian")
-			INFO_TEXT="Вы запустили установщик PortWINE ${portname} версии ${port_ver}. \n\nЭто не коммерческий продукт и развивается исключительно за идею и Ваши пожертвования. \nВсе права сторонего програмного обеспечения принадлежат их владельцам! \nПродолжая установку вы автоматически соглашаетесь с данными условиями." > /dev/null 2>&1 ;;	
-		"English")
-			INFO_TEXT="You run the installer PortWINE ${portname} v. ${port_ver}. \n\nThis is not a commercial product and developed exclusively for the idea and donate. \nAll rights to third-party software belong to their respective owners! \nContinuing the installation of you agree to these terms." > /dev/null 2>&1 ;;
-	esac
-	`zenity --info --title "INFO" --text "$INFO_TEXT" --no-wrap ` 2> /dev/null 
-	if [ $? -eq 1 ] ; then echo "error" && exit 1 ; fi
-fi
-########################################################################
-if [ "${PW_SILENT_INSTALL}" = "1" ] ; then
-	echo "${portname} is installed in ${deflink}"
-	D_PATH="${deflink}"
-else
-	case $PW_SET_LANG in
-		"Russian")
-			inst1=`zenity --title  "Install ${portname}" --text "Выберите путь для установки (обновления) порта,\nили оставьте его по умолчанию." --list --radiolist --width=350 --height=220 \
-			--column="Выбор" --column "Путь:" \
-			TRUE "${deflink}" \
-			FALSE "Другой путь..." ` 2> /dev/null
-			if [ $? -eq 1 ] ; then exit 1 ; fi
-			case $inst1 in
-				"${deflink}")
-					D_PATH="${deflink}" ;;	
-				"Другой путь...")
-					D_PATH=`zenity --file-selection --directory --title="Выберите путь..." ` 
-					D_PATH="${D_PATH}/${portname}" ;;
-			esac ;;
-		"English")
-			inst1=`zenity --title  "Install ${portname}" --text "Select the installation path (update) port,\nor leave it in default." --list --radiolist --width=350 --height=220 \
-			--column="Set..." --column "Path:" \
-			TRUE "${deflink}" \
-			FALSE "Other path..." ` 2> /dev/null
-			if [ $? -eq 1 ];then exit 1; fi
-			case $inst1 in
-				"${deflink}")
-					D_PATH="${deflink}" ;;	
-				"Other path...")
-					D_PATH=`zenity --file-selection --directory --title="Select the path..." ` 
-					D_PATH="${D_PATH}/${portname}" ;;
-			esac ;;
-	esac
-	if [ $? -eq 1 ] ; then echo "error" && exit 1 ; fi
-fi
-########################################################################
-case $PW_SET_LANG in
-	"Russian")
-		progress_bar() {
-		zenity --progress --title="Установка..." --text="Настройка ${portname}" --pulsate --auto-close --auto-kill --width=450 > /dev/null 2>&1 
-		} ;;
-	"English")
-		progress_bar() {
-		zenity --progress --title="Install..." --text="Install ${portname}" --pulsate --auto-close --auto-kill --width=450 > /dev/null 2>&1 
-		} ;;
-esac
-########################################################################
-export PORT_WINE_PATH="${D_PATH}"
-if [ ! -d "${PORT_WINE_PATH}" ] ; then
-    mkdir -p "$PORT_WINE_PATH"
-else
-	rm -fr "${PORT_WINE_PATH}/data/tmp"
-	rm -f "${PORT_WINE_PATH}/data/scripts/"* > /dev/null 2>&1
-fi
-########################################################################
-mkdir -p "${PORT_WINE_PATH}/data/tmp"
-echo "${port_ver}" > "${PORT_WINE_PATH}/data/tmp/${portname}_ver"
-case $PW_SET_LANG in
-	"Russian") echo "RUS" > "${PORT_WINE_PATH}/data/tmp/${portname}_loc" ;;
-	"English") echo "ENG" > "${PORT_WINE_PATH}/data/tmp/${portname}_loc" ;;
-esac
-########################################################################
-export PORT_WINE_TMP_PATH="${PORT_WINE_PATH}/data/tmp"
-cd "${PORT_WINE_PATH}"
-try_download_scripts () {
-	wget -O "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz" -nd -c --read-timeout 300 \
-	--retry-connrefused --timeout 15 --tries 3 \
-    --user-agent="Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" \
-	"https://github.com/Castro-Fidel/PortWINE/archive/refs/heads/master.tar.gz"	
-	if [ "$?" = "0" ] ; then
-		tar -xvzf "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz" -C "${PORT_WINE_TMP_PATH}"
-		if [ "$?" = "0" ] ; then
-			[ ! -d "${PORT_WINE_PATH}/data/" ] && mkdir "${PORT_WINE_PATH}/data/"
-			cp -fr "${PORT_WINE_TMP_PATH}/PortWINE-master/data_from_portwine/"* "${PORT_WINE_PATH}/data/"
-			rm -f "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz"
-			rm -fr "${PORT_WINE_TMP_PATH}/PortWINE-master/"
-			export scripts_current_ver=`cat "${PORT_WINE_PATH}/data/scripts/var" | grep SCRIPTS_NEXT_VERSION | awk -F "=" '{print $2}'`
-			echo "${scripts_current_ver}" > "${PORT_WINE_TMP_PATH}/scripts_ver"
-		else
-			rm -f "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz"
-			try_download_scripts
-		fi
-	else 
-		try_download_scripts
-	fi
-}
-if [ "${PW_SILENT_INSTALL}" = "1" ] & [ ! -f "/usr/bin/portproton" ] ; then
-	try_download_scripts
-else
-	try_download_scripts | progress_bar
-fi
-chmod 755 -R "${PORT_WINE_PATH}"
-########################################################################
-cd "${PORT_WINE_PATH}/data/scripts"
-/bin/bash -c "${PORT_WINE_PATH}/data/scripts/setup.sh" && exit 0
-################################ARCH_BIN################################