From 0c8b21648c60f7a5f317c05e19b63236e62e6145 Mon Sep 17 00:00:00 2001
From: castro-fidel <tergoevm@gmail.com>
Date: Thu, 17 Nov 2022 21:32:28 +0300
Subject: [PATCH] Scripts version 2143

---
 data_from_portwine/changelog_eng              |   3 +
 data_from_portwine/changelog_rus              |   3 +
 data_from_portwine/img/gui/plariumplay.png~   | Bin 3179 -> 0 bytes
 data_from_portwine/scripts/portwine_db/Origin |  57 +++++++-----------
 .../scripts/pw_autoinstall/PW_ORIGIN          |  18 ++++++
 data_from_portwine/scripts/start.sh           |   2 +-
 data_from_portwine/scripts/var                |   2 +-
 7 files changed, 47 insertions(+), 38 deletions(-)
 delete mode 100644 data_from_portwine/img/gui/plariumplay.png~
 create mode 100755 data_from_portwine/scripts/pw_autoinstall/PW_ORIGIN

diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng
index 381af9da..51bdc5dc 100755
--- a/data_from_portwine/changelog_eng
+++ b/data_from_portwine/changelog_eng
@@ -2,6 +2,9 @@ You can help us in the development of the project on the website: boosty.to/linu
 -----------------------------------------
 Changelog:
 
+###Scripts version 2142###
+* due to EA Launcher issues, the Origin installer has been temporarily reverted
+
 ###Scripts version 2142###
 * added alternative FTP server for PP component updates if download failed from main GITHUB server
 * added display of current versions of DXVK and VKD3D when they are selected in the PortProton interface
diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus
index 6bdfa7eb..7cf43763 100755
--- a/data_from_portwine/changelog_rus
+++ b/data_from_portwine/changelog_rus
@@ -2,6 +2,9 @@
 -----------------------------------------
 История изменений:
 
+###Scripts version 2142###
+* из за проблем связанных с EA Launcher, временно возвращен установщик Origin
+
 ###Scripts version 2142###
 * добавлен альтернативный FTP сервер для обновлений компонентов PP если не удалось скачать с основного сервера GITHUB
 * добавлен вывод текущих версий DXVK и VKD3D при их выборе в интерфейсе PortProton
diff --git a/data_from_portwine/img/gui/plariumplay.png~ b/data_from_portwine/img/gui/plariumplay.png~
deleted file mode 100644
index 4ef3146e4da192ff1d4ed67d3c68eedf14959f31..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3179
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
R-CF<v002ovPDHLkV1lPa4#NNd

diff --git a/data_from_portwine/scripts/portwine_db/Origin b/data_from_portwine/scripts/portwine_db/Origin
index f6eb4d28..e9fdc27e 100755
--- a/data_from_portwine/scripts/portwine_db/Origin
+++ b/data_from_portwine/scripts/portwine_db/Origin
@@ -1,42 +1,27 @@
 #!/usr/bin/env bash
 #Author: PortWINE
 #Origin.exe 
-#Rating=5
+#Rating=?
 #####################examples###########################
-export PW_DLL_INSTALL="vcrun2019"               # Install DDL in port prefix (used winetricks) 
+export PW_DLL_INSTALL="vcrun2012 vcrun2019"               # Install DDL in port prefix (used winetricks) 
 export PW_VULKAN_USE=1                       # dxvk, vkd3d or 0 for OpenGL
-# export PW_USE_TERMINAL="1"
-export PW_WINE_TKG_VER="7.20"
-export PW_WINE_USE="WINE-${PW_WINE_TKG_VER}-STAGING-TKG-AMD64"
-export PW_MUST_HAVE_DLL=""
-export PW_PREFIX_NAME="EA_APP"
-# export WINEDLLOVERRIDES="mscoree,mshtml="
+export PW_USE_TERMINAL="1"
 
-check_download_wine_ver_for_ea () {
-    if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then
-        if try_download "https://github.com/Kron4ek/Wine-Builds/releases/download/${PW_WINE_TKG_VER}/wine-${PW_WINE_TKG_VER}-staging-tkg-amd64.tar.xz" \
-        "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" ; then
-            if unpack_tar_xz "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" "${PORT_WINE_PATH}/data/dist/" ; then
-                try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz"
-                UNPACK_STATUS=0
-            else
-                try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz"
-                try_remove_dir "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}"
-            fi
-        fi
-        [[ "${UNPACK_STATUS}" != 0 ]] && exit 1
-    fi
-}
-check_download_wine_ver_for_ea
-
-if [[ -d "${PORT_WINE_PATH}/data/dist" ]] ; then
-    orig_IFS="$IFS"
-    IFS=$'\n'
-    for dist_dir in $(ls -1 "${PORT_WINE_PATH}/data/dist/") ; do
-        dist_dir_new=`echo "${dist_dir}" | awk '$1=$1' | sed -e s/[[:blank:]]/_/g`
-        if [[ ! -d "${PORT_WINE_PATH}/data/dist/${dist_dir_new^^}" ]] ; then
-            mv -- "${PORT_WINE_PATH}/data/dist/$dist_dir" "${PORT_WINE_PATH}/data/dist/${dist_dir_new^^}"
-        fi
-    done
-    IFS="$orig_IFS"
-fi
+###WINE_KRON4EK###
+# export PW_WINE_USE="WINE-7.13-STAGING-AMD64"
+# check_download_wine_ver_for_origin () {
+#     if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then
+#         if try_download "https://github.com/Kron4ek/Wine-Builds/releases/download/7.13/wine-7.13-staging-amd64.tar.xz" \
+#         "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" ; then
+#             if unpack_tar_xz "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" "${PORT_WINE_PATH}/data/dist/" ; then
+#                 try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz"
+#                 UNPACK_STATUS=0
+#             else
+#                 try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz"
+#                 try_remove_dir "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}"
+#             fi
+#         fi
+#         [[ "${UNPACK_STATUS}" != 0 ]] && exit 1
+#     fi
+# }
+# check_download_wine_ver_for_origin
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ORIGIN b/data_from_portwine/scripts/pw_autoinstall/PW_ORIGIN
new file mode 100755
index 00000000..5df45c4b
--- /dev/null
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_ORIGIN
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Author: Castro-Fidel (linux-gaming.ru)
+########################################################################
+export LAUNCH_PARAMETERS=("/silent" "/NoLaunch" )
+export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/OriginSetup.exe"
+start_portwine
+if try_download "origin-a.akamaihd.net/Origin-Client-Download/origin/live/OriginThinSetup.exe" "${PW_AUTOINSTALL_EXE}"
+then
+    pw_start_progress_bar_block "${loc_gui_installing_the} Origin. ${loc_gui_please_wait}"
+    # pw_kill_autostart Origin.exe &
+    pw_run "${PW_AUTOINSTALL_EXE}"
+    portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Origin/Origin.exe"
+    pw_stop_progress_bar
+    try_remove_file "${PW_AUTOINSTALL_EXE}"
+    kill_portwine
+    portwine_create_shortcut
+fi
+stop_portwine 
diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh
index a315cad2..345a957a 100755
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -690,7 +690,7 @@ else
     --field="   Ubisoft Game Launcher"!"$PW_GUI_ICON_PATH/ubc.png"!"":"FBTN" '@bash -c "button_click PW_UBC"' \
     --field="   EVE Online Launcher"!"$PW_GUI_ICON_PATH/eve.png"!"":"FBTN" '@bash -c "button_click PW_EVE"' \
     --field="   Lesta Game Center"!"$PW_GUI_ICON_PATH/lgc.png"!"":"FBTN" '@bash -c "button_click PW_LGC"' \
-    --field="   EA Launcher (Origin)"!"$PW_GUI_ICON_PATH/eaapp.png"!"":"FBTN" '@bash -c "button_click PW_EAAPP"' \
+    --field="   Origin"!"$PW_GUI_ICON_PATH/origin.png"!"":"FBTN" '@bash -c "button_click PW_ORIGIN"' \
     --field="   Rockstar Games Launcher"!"$PW_GUI_ICON_PATH/Rockstar.png"!"":"FBTN" '@bash -c "button_click PW_ROCKSTAR"' \
     --field="   vkPlay Games Center"!"$PW_GUI_ICON_PATH/mygames.png"!"":"FBTN" '@bash -c "button_click PW_VKPLAY"' \
     --field="   Ankama Launcher"!"$PW_GUI_ICON_PATH/ankama.png"!"":"FBTN" '@bash -c "button_click PW_ANKAMA"' \
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index d77cd2dd..493d798c 100755
--- a/data_from_portwine/scripts/var
+++ b/data_from_portwine/scripts/var
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #Author: Castro-Fidel (linux-gaming.ru)
-#SCRIPTS_NEXT_VERSION=2142
+#SCRIPTS_NEXT_VERSION=2143
 ########################################################################
 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