From 999b4592be8f1b30d2b052026486af9b2d29de14 Mon Sep 17 00:00:00 2001
From: castro-fidel <tergoevm@gmail.com>
Date: Thu, 3 Dec 2020 22:41:55 +0300
Subject: [PATCH] Added silent installation

---
 data_from_portwine/scripts/portproton.sh           | 10 +++++++---
 data_from_portwine/scripts/runlib                  |  4 ++++
 data_from_portwine/scripts/setup                   |  8 +++++++-
 data_from_portwine/scripts/vars/PortBattleNET_vars |  1 -
 data_from_portwine/scripts/vars/PortEpic_vars      |  2 +-
 data_from_portwine/scripts/vars/PortGOG_vars       |  2 +-
 data_from_portwine/scripts/vars/PortLoL_vars       |  2 +-
 data_from_portwine/scripts/vars/PortMailRu_vars    |  2 +-
 data_from_portwine/scripts/vars/PortOrigin_vars    |  2 +-
 data_from_portwine/scripts/vars/PortProton_vars    |  2 +-
 data_from_portwine/scripts/vars/PortUplay_vars     |  2 +-
 data_from_portwine/scripts/vars/PortWGC_vars       |  1 -
 12 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/data_from_portwine/scripts/portproton.sh b/data_from_portwine/scripts/portproton.sh
index 19b5bfa8..220d08af 100755
--- a/data_from_portwine/scripts/portproton.sh
+++ b/data_from_portwine/scripts/portproton.sh
@@ -1,17 +1,21 @@
 #!/bin/bash
 # Author: PortWINE-Linux.ru
 . "$(dirname $(readlink -f "$0"))/runlib"
+START_PORTWINE
 if [ -f "$1" ]; then
     export portwine_exe="$(readlink -f "$1")"
     export PATH_TO_GAME="$( cd "$( dirname "$1" )" >/dev/null 2>&1 && pwd )"
-    START_PORTWINE
     if [ ! -z ${optirun_on} ]; then
         "${PW_RUNTIME}" $PW_TERM ${optirun_on} "${port_on_run}" "run" "$portwine_exe"
     else
         "${PW_RUNTIME}" $PW_TERM "${port_on_run}" "run" "$portwine_exe"
     fi
 else
-    START_PORTWINE
-    sh "${PORT_SCRIPTS_PATH}/winefile"
+    if [ ! -z ${optirun_on} ]
+    then
+        "${PW_RUNTIME}" $PW_TERM ${optirun_on} "${port_on_run}" "run" "explorer" 
+    else
+        "${PW_RUNTIME}" $PW_TERM "${port_on_run}" "run" "explorer" 
+    fi
 fi
 STOP_PORTWINE
diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib
index 441083cd..758f9241 100755
--- a/data_from_portwine/scripts/runlib
+++ b/data_from_portwine/scripts/runlib
@@ -11,6 +11,10 @@ clear && echo '
 '
 ########################################################################
 [ $(id -u) = 0 ] && echo "Do not run this script as root!" && zenity --error --text "Do not run this script as root!" && exit 1
+if [ "${s_install}" != "1" ] && [ ! -x "`which "zenity" 2>/dev/null`" ];then
+    echo "You will need to install: zenity, and restart the port." 
+    xdg-open "http://portwine-linux.ru/portwine-faq/" > /dev/null 2>&1 & exit 0
+fi
 ########################################################################
 sszen() {
 zenity --progress --title="Settings..." --text="Updating start parameters" --pulsate --auto-close --auto-kill --width=450
diff --git a/data_from_portwine/scripts/setup b/data_from_portwine/scripts/setup
index 3700b252..9c063faa 100755
--- a/data_from_portwine/scripts/setup
+++ b/data_from_portwine/scripts/setup
@@ -118,4 +118,10 @@ if [ -f "${PORT_WINE_PATH}/restart.desktop" ]; then
 fi
 
 update-desktop-database -q "${HOME}/.local/share/applications"
-xdg-open "http://portwine-linux.ru/portwine-faq/" > /dev/null 2>&1 & exit 0  
+
+if [ "${s_install}" = "1" ]; then
+	echo "Installation completed successfully."
+else
+	`zenity --info --title "${inst_set_top}" --text "${inst_succ}" --no-wrap ` > /dev/null 2>&1  
+	xdg-open "http://portwine-linux.ru/portwine-faq/" > /dev/null 2>&1 & exit 0
+fi  
diff --git a/data_from_portwine/scripts/vars/PortBattleNET_vars b/data_from_portwine/scripts/vars/PortBattleNET_vars
index 6cc3ffd7..0377ac99 100755
--- a/data_from_portwine/scripts/vars/PortBattleNET_vars
+++ b/data_from_portwine/scripts/vars/PortBattleNET_vars
@@ -51,5 +51,4 @@ echo " "
 ADD_IN_POST_INSTALL ()
 {
 rm -f "${PORT_WINE_PATH}/data/pfx/drive_c/ProgramData/Battle.net/Agent/product.db"
-`zenity --info --title "${inst_set_top}" --text "${inst_succ}" --no-wrap ` > /dev/null 2>&1  
 }
diff --git a/data_from_portwine/scripts/vars/PortEpic_vars b/data_from_portwine/scripts/vars/PortEpic_vars
index 583f02c9..d495e30a 100755
--- a/data_from_portwine/scripts/vars/PortEpic_vars
+++ b/data_from_portwine/scripts/vars/PortEpic_vars
@@ -47,6 +47,6 @@ echo " "
 ########################################################################
 ADD_IN_POST_INSTALL ()
 {
-`zenity --info --title "${inst_set_top}" --text "${inst_succ}" --no-wrap ` > /dev/null 2>&1  
+echo " "
 }
 
diff --git a/data_from_portwine/scripts/vars/PortGOG_vars b/data_from_portwine/scripts/vars/PortGOG_vars
index 49b7c3d9..2bee2752 100755
--- a/data_from_portwine/scripts/vars/PortGOG_vars
+++ b/data_from_portwine/scripts/vars/PortGOG_vars
@@ -47,5 +47,5 @@ echo " "
 ########################################################################
 ADD_IN_POST_INSTALL ()
 {
-`zenity --info --title "${inst_set_top}" --text "${inst_succ}" --no-wrap ` > /dev/null 2>&1  
+echo " "
 }
diff --git a/data_from_portwine/scripts/vars/PortLoL_vars b/data_from_portwine/scripts/vars/PortLoL_vars
index 2b50e300..cddd711c 100755
--- a/data_from_portwine/scripts/vars/PortLoL_vars
+++ b/data_from_portwine/scripts/vars/PortLoL_vars
@@ -53,6 +53,6 @@ echo " "
 ########################################################################
 ADD_IN_POST_INSTALL ()
 {
-`zenity --info --title "${inst_set_top}" --text "${inst_succ}" --no-wrap ` > /dev/null 2>&1  
+echo " "
 }
 
diff --git a/data_from_portwine/scripts/vars/PortMailRu_vars b/data_from_portwine/scripts/vars/PortMailRu_vars
index adb60b98..7ecd1b51 100755
--- a/data_from_portwine/scripts/vars/PortMailRu_vars
+++ b/data_from_portwine/scripts/vars/PortMailRu_vars
@@ -38,5 +38,5 @@ echo " "
 ########################################################################
 ADD_IN_POST_INSTALL ()
 {
-`zenity --info --title "${inst_set_top}" --text "${inst_succ}" --no-wrap ` > /dev/null 2>&1  
+echo " "
 }
diff --git a/data_from_portwine/scripts/vars/PortOrigin_vars b/data_from_portwine/scripts/vars/PortOrigin_vars
index 4b787df8..ec5a0f7a 100755
--- a/data_from_portwine/scripts/vars/PortOrigin_vars
+++ b/data_from_portwine/scripts/vars/PortOrigin_vars
@@ -50,5 +50,5 @@ echo " "
 ########################################################################
 ADD_IN_POST_INSTALL ()
 {
-`zenity --info --title "${inst_set_top}" --text "${inst_succ}" --no-wrap ` > /dev/null 2>&1  
+echo " "
 }
diff --git a/data_from_portwine/scripts/vars/PortProton_vars b/data_from_portwine/scripts/vars/PortProton_vars
index 703c3acc..95e41dea 100755
--- a/data_from_portwine/scripts/vars/PortProton_vars
+++ b/data_from_portwine/scripts/vars/PortProton_vars
@@ -63,5 +63,5 @@ done
 ########################################################################
 ADD_IN_POST_INSTALL ()
 {
-`zenity --info --title "${inst_set_top}" --text "${inst_succ}" --no-wrap ` > /dev/null 2>&1  
+echo " "
 }
diff --git a/data_from_portwine/scripts/vars/PortUplay_vars b/data_from_portwine/scripts/vars/PortUplay_vars
index 03d2fbc1..1f65ab4f 100755
--- a/data_from_portwine/scripts/vars/PortUplay_vars
+++ b/data_from_portwine/scripts/vars/PortUplay_vars
@@ -47,5 +47,5 @@ echo " "
 ########################################################################
 ADD_IN_POST_INSTALL ()
 {
-`zenity --info --title "${inst_set_top}" --text "${inst_succ}" --no-wrap ` > /dev/null 2>&1  
+echo " "
 }
diff --git a/data_from_portwine/scripts/vars/PortWGC_vars b/data_from_portwine/scripts/vars/PortWGC_vars
index 52127c66..d985943d 100755
--- a/data_from_portwine/scripts/vars/PortWGC_vars
+++ b/data_from_portwine/scripts/vars/PortWGC_vars
@@ -52,5 +52,4 @@ if [ "${update_loc}" = "ENG" ]; then
     sed -i 's/RU/EN/g' "${PORT_WINE_PATH}/data/pfx/drive_c/Games/WGC/preferences.xml"
     sed -i 's/ru/en/g' "${PORT_WINE_PATH}/data/pfx/drive_c/Games/WGC/preferences.xml"
 fi
-`zenity --info --title "${inst_set_top}" --text "${inst_succ}" --no-wrap ` > /dev/null 2>&1  
 }