From ad0ad7bfcb9a1ad64335a1ecf15901b555340b83 Mon Sep 17 00:00:00 2001
From: Mikhail Tergoev <fidel@altlinux.org>
Date: Thu, 20 Mar 2025 19:07:30 +0300
Subject: [PATCH] updated EVE autoinstall

---
 .../scripts/portwine_db/eve.ppdb              |  4 +--
 .../scripts/pw_autoinstall/PW_EVE             | 28 +++++++++++--------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/data_from_portwine/scripts/portwine_db/eve.ppdb b/data_from_portwine/scripts/portwine_db/eve.ppdb
index ba4eb50e..ee308ef5 100644
--- a/data_from_portwine/scripts/portwine_db/eve.ppdb
+++ b/data_from_portwine/scripts/portwine_db/eve.ppdb
@@ -15,8 +15,8 @@ if [[ "${DESKTOP_SESSION}" =~ "gnome" ]] \
 fi
 export PW_WINDOWS_VER="10"
 export PW_WINE_USE="WINE_LG"
-export PW_USE_WINE_DXGI="1"
-export PW_VULKAN_USE="1"
+export PW_USE_WINE_DXGI="0"
+export PW_VULKAN_USE="2"
 export PW_USE_GSTREAMER="0"
 export PW_PREFIX_NAME="EVE_ONLINE"
 export PW_WINE_FULLSCREEN_FSR="0"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EVE b/data_from_portwine/scripts/pw_autoinstall/PW_EVE
index d44aa19c..b5f63e33 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_EVE
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_EVE
@@ -8,8 +8,8 @@
 ########################################################################
 export PW_WINDOWS_VER="10"
 export PW_WINE_USE="WINE_LG"
-export PW_USE_WINE_DXGI="1"
-export PW_VULKAN_USE="1"
+export PW_USE_WINE_DXGI="0"
+export PW_VULKAN_USE="2"
 export PW_USE_GSTREAMER="0"
 export PW_PREFIX_NAME="EVE_ONLINE"
 export PW_WINE_FULLSCREEN_FSR="0"
@@ -20,7 +20,6 @@ export PW_USE_EAC_AND_BE="1"
 export PW_DLL_INSTALL="vcrun2022 d3dcompiler_47 arial tahoma" # msdelta
 export WINEDLLOVERRIDES="msvcp140,msvcp140_1=n"
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/eve-online-latest+Setup.exe"
-export PORTWINE_CREATE_SHORTCUT_NAME="EVE Online Launcher"
 
 start_portwine
 if try_download "https://launcher.ccpgames.com/eve-online/release/win32/x64/eve-online-latest+Setup.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
@@ -29,24 +28,29 @@ then
     EVE_LAUNCHER_DIR="${WINEPREFIX}/drive_c/users/steamuser/AppData/Local/eve-online"
 
     $pw_7z x "${PW_USER_TEMP}/eve-online-latest+Setup.exe" -o"${EVE_LAUNCHER_DIR}" -y
-    $pw_7z x "${EVE_LAUNCHER_DIR}/eve-online-`cat "${EVE_LAUNCHER_DIR}/RELEASES" | awk '{print $2}' | awk -F"-" '{print $3}'`-full.nupkg" -o"${EVE_LAUNCHER_DIR}/tmp" -y
+    EVE_VERSION="$(cat "${EVE_LAUNCHER_DIR}/RELEASES" | awk '{print $2}' | awk -F"-" '{print $3}')"
 
-    APP_DIR="app-`cat "${EVE_LAUNCHER_DIR}/RELEASES" | awk '{print $2}' | awk -F"-" '{print $3}'`"
+    $pw_7z x "${EVE_LAUNCHER_DIR}/eve-online-${EVE_VERSION}-full.nupkg" -o"${EVE_LAUNCHER_DIR}/tmp" -y
 
-    create_new_dir "${EVE_LAUNCHER_DIR}/$APP_DIR"
+
+    create_new_dir "${EVE_LAUNCHER_DIR}/app-$EVE_VERSION"
     create_new_dir "${EVE_LAUNCHER_DIR}/packages/SquirrelTemp"
 
-    cp -r "${EVE_LAUNCHER_DIR}/tmp/lib/net45/." "${EVE_LAUNCHER_DIR}/$APP_DIR"
-    cp "${EVE_LAUNCHER_DIR}/eve-online-`cat "${EVE_LAUNCHER_DIR}/RELEASES" | awk '{print $2}' | awk -F"-" '{print $3}'`-full.nupkg" "${EVE_LAUNCHER_DIR}/packages"
-    mv "${EVE_LAUNCHER_DIR}/${APP_DIR}/eve-online_ExecutionStub.exe" "${EVE_LAUNCHER_DIR}/eve-online.exe"
+    cp -r "${EVE_LAUNCHER_DIR}/tmp/lib/net45/." "${EVE_LAUNCHER_DIR}/app-$EVE_VERSION"
+    cp "${EVE_LAUNCHER_DIR}/eve-online-${EVE_VERSION}-full.nupkg" "${EVE_LAUNCHER_DIR}/packages"
+    mv "${EVE_LAUNCHER_DIR}/app-${EVE_VERSION}/eve-online_ExecutionStub.exe" "${EVE_LAUNCHER_DIR}/eve-online.exe"
     cp "${EVE_LAUNCHER_DIR}/RELEASES" "${EVE_LAUNCHER_DIR}/packages"
     mv "${EVE_LAUNCHER_DIR}/setupIcon.ico" "${EVE_LAUNCHER_DIR}/app.ico"
-    rm -rf  "${EVE_LAUNCHER_DIR}/background.gif" "${EVE_LAUNCHER_DIR}/eve-online-`cat "${EVE_LAUNCHER_DIR}/RELEASES" | awk '{print $2}' | awk -F"-" '{print $3}'`-full.nupkg" "${EVE_LAUNCHER_DIR}/RELEASES" "${EVE_LAUNCHER_DIR}/tmp"
+    rm -rf  "${EVE_LAUNCHER_DIR}/background.gif" "${EVE_LAUNCHER_DIR}/eve-online-${EVE_VERSION}-full.nupkg" "${EVE_LAUNCHER_DIR}/RELEASES" "${EVE_LAUNCHER_DIR}/tmp"
+
+    pw_stop_progress_bar
 
     portwine_exe="${EVE_LAUNCHER_DIR}/eve-online.exe"
-    pw_stop_progress_bar
-    portwine_create_shortcut
     try_remove_file "${PW_AUTOINSTALL_EXE}"
     try_remove_file "${portwine_exe}.ppdb"
+    
+    export PORTWINE_CREATE_SHORTCUT_NAME="EVE Online Launcher"
+    portwine_create_shortcut
+
 fi
 stop_portwine