From e291a2e90d548a41a11554b6b2d4999cc568ab0b Mon Sep 17 00:00:00 2001
From: castro-fidel <tergoevm@gmail.com>
Date: Fri, 3 Sep 2021 18:17:42 +0200
Subject: [PATCH] ###Scripts version 2006###

---
 data_from_portwine/changelog                |   8 ++++--
 data_from_portwine/img/gui/mygames.png      | Bin 0 -> 2751 bytes
 data_from_portwine/scripts/autoinstall      |  19 +++++++++++++
 data_from_portwine/scripts/functions_helper |   2 +-
 data_from_portwine/scripts/start.sh         |   5 ++--
 data_from_portwine/scripts/var              |   2 +-
 data_from_portwine/vkBasalt.conf            |   2 +-
 portwine_install_script/PortNAME-XX         |  30 ++++++++++----------
 8 files changed, 46 insertions(+), 22 deletions(-)
 create mode 100644 data_from_portwine/img/gui/mygames.png

diff --git a/data_from_portwine/changelog b/data_from_portwine/changelog
index 7ed3f231..c7c19d75 100644
--- a/data_from_portwine/changelog
+++ b/data_from_portwine/changelog
@@ -10,12 +10,16 @@
 * добавить комментарии описывающие функционал скриптов
 * заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru
 -----------------------------------------
-###Scripts version 2005###
+###Scripts version 2006###
+* HOTFIX - для AUTOINSTALL
+* в AUTOINSTALL добавлен MY.GAMES
+
+###PortProton-95### 02.09.2021 ###Scripts version 2005###
 * обновлен db файл для steam (под ProtonGE связь с интернетом снова есть) - Спасибо Cefeiko!
 * обновлен WINE PROTON_GE 6.16-GE1
 * переменная PW_GUI_DISABLED_CS сбрасывается при запуске порта (для совместимости со старыми ярлыками которые были созданы на предыдущих версиях порта)
 * добавлена возможность создавать 32-х битный префикс (необходимо для будущей автоустановки League of Legends)
-* в GUI AUTOINSTALL добавлены лаунчеры Bethesda.net Launcher и Rockstar-Games-Launcher
+* в GUI AUTOINSTALL добавлены лаунчеры Bethesda.net Launcher и Rockstar-Games-Launcher - Спасибо chal55rus (Sergey P.)!
 * улучшена функция pw_kill_autostart
 
 ###Scripts version 2004###
diff --git a/data_from_portwine/img/gui/mygames.png b/data_from_portwine/img/gui/mygames.png
new file mode 100644
index 0000000000000000000000000000000000000000..247da67e860d5243440d707765967cc2f0677ca9
GIT binary patch
literal 2751
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
FV1gh=5mo>I

literal 0
HcmV?d00001

diff --git a/data_from_portwine/scripts/autoinstall b/data_from_portwine/scripts/autoinstall
index 646521ac..42c554f1 100644
--- a/data_from_portwine/scripts/autoinstall
+++ b/data_from_portwine/scripts/autoinstall
@@ -233,4 +233,23 @@ PW_ROCKSTAR () {
         portwine_create_shortcut
     fi
     stop_portwine
+}
+
+PW_MYGAMES () {
+    export LAUNCH_PARAMETERS=("")
+    export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/MyGamesLoader.exe"
+    start_portwine
+    if try_download "https://static.gc.my.games/MyGamesLoader.exe" "${PW_AUTOINSTALL_EXE}"
+    then
+        pw_start_progress_bar_block "Installing the My.Games. Please wait..."
+        pw_kill_autostart GameCenter.exe &
+        pw_run "${PW_AUTOINSTALL_EXE}"
+        portwine_exe="$WINEPREFIX/drive_c/users/steamuser/AppData/Local/GameCenter/GameCenter.exe"
+        try_remove_file "${PW_AUTOINSTALL_EXE}"
+        kill_portwine
+        pw_stop_progress_bar
+        export PORTWINE_CREATE_SHORTCUT_NAME="MY.GAMES"
+        portwine_create_shortcut
+    fi
+    stop_portwine
 }
\ No newline at end of file
diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index 58acbb86..d5be944a 100644
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -576,7 +576,7 @@ pw_kill_autostart () {
     else
         sleep 10
         while true ; do
-            if  [ -z "`ps aux | grep "$1" | head -n 1 | awk '{print $2}'`" ] && [ ! -z "`pgrep wrap | head -n 1`" ]; then
+            if  [ -z "`ps aux | grep "$1" | head -n 1 | awk '{print $2}' | grep -v grep`" ] && [ ! -z "`pgrep wrap | head -n 1`" ]; then
                 echo -e "PID "$1" not found"
                 sleep 1
             else
diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh
index 7382df06..b4ae0ebb 100755
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -322,6 +322,7 @@ else
     --field="   Origin Launcher"!"$PW_GUI_ICON_PATH/origin.png":"BTN" '@bash -c "button_click PW_ORIGIN"' \
     --field="   Bethesda.net Launcher"!"$PW_GUI_ICON_PATH/Bethesda.png":"BTN" '@bash -c "button_click PW_BETHESDA"' \
     --field="   Rockstar Games Launcher"!"$PW_GUI_ICON_PATH/Rockstar.png":"BTN" '@bash -c "button_click PW_ROCKSTAR"' \
+    --field="   My.Games Launcher"!"$PW_GUI_ICON_PATH/mygames.png":"BTN" '@bash -c "button_click PW_MYGAMES"' \
     --field="   OSU"!"$PW_GUI_ICON_PATH/osu.png":"BTN" '@bash -c "button_click PW_OSU"' & \
 
     "${pw_yad}" --plug=${KEY} --tabnum=1 --columns=3 --form --separator=";" \
@@ -363,9 +364,9 @@ if [ ! -z "${VULKAN_MOD}" ] ; then
     fi
 fi
 
-init_wine_ver 
+init_wine_ver
 
-if [ -z "${PW_DISABLED_CREAT_DB}" ] ; then 
+if [ -z "${PW_DISABLED_CREAT_DB}" ] ; then
     if [ ! -z "${PORTWINE_DB}" ] ; then
         PORTWINE_DB_FILE=`grep -il "\#${PORTWINE_DB}.exe" "${PORT_SCRIPTS_PATH}/portwine_db"/*`
         if [ -z "${PORTWINE_DB_FILE}" ] ; then
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index 5f58c3f6..394887a0 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=2005
+#SCRIPTS_NEXT_VERSION=2006
 ########################################################################
 export PW_MANGOHUD=1
 export MANGOHUD_CONFIG=font_size=24,position=top-left,toggle_hud=Shift_R+F12,no_display,resolution,wine,gpu_name,vulkan_driver,gpu_stats,vkbasalt
diff --git a/data_from_portwine/vkBasalt.conf b/data_from_portwine/vkBasalt.conf
index 88597760..bc56d3f2 100644
--- a/data_from_portwine/vkBasalt.conf
+++ b/data_from_portwine/vkBasalt.conf
@@ -1,4 +1,4 @@
-reshadeTexturePath = /usr/local/share/reshade/Textures
+reshadeTexturePath = /usr/local/share/reshade/textures
 reshadeIncludePath = /usr/local/share/reshade/
 FakeMotionBlur = /usr/local/share/reshade/shaders/FakeMotionBlur.fx
 FXAA = /usr/local/share/reshade/shaders/FXAA.fx
diff --git a/portwine_install_script/PortNAME-XX b/portwine_install_script/PortNAME-XX
index fe518c12..ab676527 100644
--- a/portwine_install_script/PortNAME-XX
+++ b/portwine_install_script/PortNAME-XX
@@ -21,29 +21,29 @@ export PROGS_INST=""
 export vexit=0
 export minimum_ldd_ver="2.21"
 ########################################################################
-export local_script_hash=$(sha256sum "$0" | awk '{print $1}')
-export remote_script_hash=`curl -s --list-only "${PW_FTP_URL}/portwine/${portname}-${port_ver}.sha256sum" | awk '{print $1}'`
-if [ "${local_script_hash}" != "${remote_script_hash}" ] ; then
-	echo "\033[31mHash sum does not match, please download the ${portname}-${port_ver} again.\033[0m"
-	zenity --error --no-wrap --text "Hash sum does not match, please download the ${portname}-${port_ver} again." 2> /dev/null  
-	exit 1
-fi	
-export system_ldd_ver=`ldd --version | grep -m1 ldd | awk '{print $NF}'` 
-if [ `echo ${system_ldd_ver} | tr -d .` -lt `echo ${minimum_ldd_ver} | tr -d .` ] ; then
-	echo "\033[31mYour system doesn\`t support ${portname}.\nGlibc version required >= ${minimum_ldd_ver}\nGlibc in your system = ${system_ldd_ver}\033[0m"
-	zenity --error --no-wrap --text "Your system doesn\`t support ${portname}.\nGlibc version required >= ${minimum_ldd_ver}\nGlibc in your system = ${system_ldd_ver}" 2> /dev/null  
-	exit 1
-fi
-for PROGS in "wget" "curl" "tar" 
+for PROGS in "wget" "curl" "tar" "sha256sum" "awk"
 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" 
+    echo "You will need to install: ${PROGS_INST}, and restart the script"
     exit 1
 fi
+export local_script_hash=$(sha256sum "$0" | awk '{print $1}')
+export remote_script_hash=`curl -s --list-only "${PW_FTP_URL}/portwine/${portname}-${port_ver}.sha256sum" | awk '{print $1}'`
+if [ "${local_script_hash}" != "${remote_script_hash}" ] ; then
+	echo "\033[31mHash sum does not match, please download the ${portname}-${port_ver} again.\033[0m"
+	zenity --error --no-wrap --text "Hash sum does not match, please download the ${portname}-${port_ver} again." 2> /dev/null
+	exit 1
+fi
+export system_ldd_ver=`ldd --version | grep -m1 ldd | awk '{print $NF}'`
+if [ `echo ${system_ldd_ver} | tr -d .` -lt `echo ${minimum_ldd_ver} | tr -d .` ] ; then
+	echo "\033[31mYour system doesn\`t support ${portname}.\nGlibc version required >= ${minimum_ldd_ver}\nGlibc in your system = ${system_ldd_ver}\033[0m"
+	zenity --error --no-wrap --text "Your system doesn\`t support ${portname}.\nGlibc version required >= ${minimum_ldd_ver}\nGlibc in your system = ${system_ldd_ver}" 2> /dev/null  
+	exit 1
+fi
 ########################################################################
 cd "$(dirname "`readlink -f "$0"`")"
 links="$(pwd)"