From 771b0c060d26ef50af9ff53e5454efa91e2871b7 Mon Sep 17 00:00:00 2001
From: castro-fidel <tergoevm@gmail.com>
Date: Wed, 27 Oct 2021 20:21:12 +0300
Subject: [PATCH] ###Scripts version 2038###

---
 data_from_portwine/changelog        | 4 ++--
 data_from_portwine/scripts/runlib   | 7 +++++--
 data_from_portwine/scripts/start.sh | 4 +---
 data_from_portwine/scripts/var      | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/data_from_portwine/changelog b/data_from_portwine/changelog
index e00381f..67c3561 100755
--- a/data_from_portwine/changelog
+++ b/data_from_portwine/changelog
@@ -7,8 +7,8 @@
 * добавить проверку количества db файлов на один exe
 * заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru
 -----------------------------------------
-###Scripts version 2037###
-* HOTFIX - исправление установки League of Legends без префикса
+###Scripts version 2037 - 2038###
+* продолжение исправление функции AUTOINSTALL
 
 ###Scripts version 2036###
 * улучшено скачивание с github
diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib
index a4df50e..c692b51 100755
--- a/data_from_portwine/scripts/runlib
+++ b/data_from_portwine/scripts/runlib
@@ -260,6 +260,9 @@ start_portwine () {
     -z "`cat ${WINEPREFIX}/.wine_ver | grep ${PW_WINE_USE}`" ]]
     then
         # pw_clear_pfx
+        OLD_PW_WINE_USE="${PW_WINE_USE}"
+        export PW_WINE_USE=PROTON_STEAM
+        init_wine_ver
         create_new_dir "${WINEPREFIX}"
         create_new_dir "${WINEPREFIX}/drive_c"
         create_new_dir "${WINEPREFIX}/dosdevices"
@@ -273,11 +276,11 @@ start_portwine () {
         try_copy_file "${WINEDIR}/share/fonts/"LiberationSerif-Regular.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"times.ttf
         try_copy_file "${WINEDIR}/share/fonts/"LiberationMono-Regular.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"cour.ttf
         try_copy_file "${WINEDIR}/share/fonts/"SourceHanSansSCRegular.otf "${WINEPREFIX}/drive_c/windows/Fonts/"msyh.ttf
-        # kill_portwine &&
         ${pw_runtime} env LD_LIBRARY_PATH="${PW_AND_RUNTIME_LIBRARY_PATH}${LD_LIBRARY_PATH}" "${WINELOADER}" wineboot -i
         wait_wineserver &&
-        # kill_portwine &&
         echo "${PW_WINE_USE}" > "${WINEPREFIX}/.wine_ver"
+        export PW_WINE_USE="${OLD_PW_WINE_USE}"
+        init_wine_ver
     fi
     [ ! -d "${WINEPREFIX}/dosdevices/c:" ] && try_force_link_dir "${WINEPREFIX}/drive_c/" "${WINEPREFIX}/dosdevices/c:"
     [ ! -d "${WINEPREFIX}/dosdevices/z:" ] && try_force_link_dir "/" "${WINEPREFIX}/dosdevices/z:"
diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh
index ef21fc1..73e9c97 100755
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -217,7 +217,7 @@ pw_edit_db () {
 
 pw_autoinstall_from_db () {
     kill_portwine
-    export PW_USER_TEMP="$WINEPREFIX/drive_c/users/steamuser/Temp"
+    export PW_USER_TEMP="$WINEPREFIX/drive_c"
     export PW_FORCE_LARGE_ADDRESS_AWARE=0
     export PW_USE_GAMEMODE=0
     export PW_CHECK_AUTOINSTAL=1
@@ -231,8 +231,6 @@ pw_autoinstall_from_db () {
     export PW_NO_ESYNC=1
     unset PORTWINE_CREATE_SHORTCUT_NAME
     export PW_DISABLED_CREAT_DB=1
-    start_portwine
-    kill_portwine
     . "${PORT_SCRIPTS_PATH}/pw_autoinstall/${PW_YAD_SET}"
 }
 
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index 9e44bae..0d75380 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=2037
+#SCRIPTS_NEXT_VERSION=2038
 #PORT_NEXT_VERSION=97
 ########################################################################
 export PW_MANGOHUD=0