Commit 771b0c06 authored by Mikhail Tergoev's avatar Mikhail Tergoev

###Scripts version 2038###

parent e847eed3
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
* добавить проверку количества db файлов на один exe * добавить проверку количества db файлов на один exe
* заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru * заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru
----------------------------------------- -----------------------------------------
###Scripts version 2037### ###Scripts version 2037 - 2038###
* HOTFIX - исправление установки League of Legends без префикса * продолжение исправление функции AUTOINSTALL
###Scripts version 2036### ###Scripts version 2036###
* улучшено скачивание с github * улучшено скачивание с github
......
...@@ -260,6 +260,9 @@ start_portwine () { ...@@ -260,6 +260,9 @@ start_portwine () {
-z "`cat ${WINEPREFIX}/.wine_ver | grep ${PW_WINE_USE}`" ]] -z "`cat ${WINEPREFIX}/.wine_ver | grep ${PW_WINE_USE}`" ]]
then then
# pw_clear_pfx # 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}"
create_new_dir "${WINEPREFIX}/drive_c" create_new_dir "${WINEPREFIX}/drive_c"
create_new_dir "${WINEPREFIX}/dosdevices" create_new_dir "${WINEPREFIX}/dosdevices"
...@@ -273,11 +276,11 @@ start_portwine () { ...@@ -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/"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/"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 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 ${pw_runtime} env LD_LIBRARY_PATH="${PW_AND_RUNTIME_LIBRARY_PATH}${LD_LIBRARY_PATH}" "${WINELOADER}" wineboot -i
wait_wineserver && wait_wineserver &&
# kill_portwine &&
echo "${PW_WINE_USE}" > "${WINEPREFIX}/.wine_ver" echo "${PW_WINE_USE}" > "${WINEPREFIX}/.wine_ver"
export PW_WINE_USE="${OLD_PW_WINE_USE}"
init_wine_ver
fi fi
[ ! -d "${WINEPREFIX}/dosdevices/c:" ] && try_force_link_dir "${WINEPREFIX}/drive_c/" "${WINEPREFIX}/dosdevices/c:" [ ! -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:" [ ! -d "${WINEPREFIX}/dosdevices/z:" ] && try_force_link_dir "/" "${WINEPREFIX}/dosdevices/z:"
......
...@@ -217,7 +217,7 @@ pw_edit_db () { ...@@ -217,7 +217,7 @@ pw_edit_db () {
pw_autoinstall_from_db () { pw_autoinstall_from_db () {
kill_portwine 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_FORCE_LARGE_ADDRESS_AWARE=0
export PW_USE_GAMEMODE=0 export PW_USE_GAMEMODE=0
export PW_CHECK_AUTOINSTAL=1 export PW_CHECK_AUTOINSTAL=1
...@@ -231,8 +231,6 @@ pw_autoinstall_from_db () { ...@@ -231,8 +231,6 @@ pw_autoinstall_from_db () {
export PW_NO_ESYNC=1 export PW_NO_ESYNC=1
unset PORTWINE_CREATE_SHORTCUT_NAME unset PORTWINE_CREATE_SHORTCUT_NAME
export PW_DISABLED_CREAT_DB=1 export PW_DISABLED_CREAT_DB=1
start_portwine
kill_portwine
. "${PORT_SCRIPTS_PATH}/pw_autoinstall/${PW_YAD_SET}" . "${PORT_SCRIPTS_PATH}/pw_autoinstall/${PW_YAD_SET}"
} }
......
#!/bin/bash #!/bin/bash
#Author: Castro-Fidel (PortWINE-Linux.ru) #Author: Castro-Fidel (PortWINE-Linux.ru)
#SCRIPTS_NEXT_VERSION=2037 #SCRIPTS_NEXT_VERSION=2038
#PORT_NEXT_VERSION=97 #PORT_NEXT_VERSION=97
######################################################################## ########################################################################
export PW_MANGOHUD=0 export PW_MANGOHUD=0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment