diff --git a/data_from_portwine/changelog b/data_from_portwine/changelog index 2aff9ce..c1ce2bc 100644 --- a/data_from_portwine/changelog +++ b/data_from_portwine/changelog @@ -15,6 +15,11 @@ * добавить контроль за окнами для правильного отключения прогресс бара * зарабатывать на жизнь развитием проекта с помощью вашей подписки на https://boosty.to/portwine-linux.ru ----------------------------------------- +###Scripts version 1080### +* обновлен контейнер в libs_v14 до версии Debian 10.9 +* добавлен аргумент запуска RUNTIME "--filesystem=${PORT_WINE_PATH}" для возможности установки и использования порта вне $HOME +* перенос создания символьной ссылки на drive_c из скрипта setup в runlib + ###Scripts version 1079### * HOTFIX - libs_v13 исправленна битая ссылка c "runtime/lib64/ld-linux-x86-64.so.2" на "../lib/x86_64-linux-gnu/ld-2.15.so" diff --git a/data_from_portwine/data_from_portwine.tar.gz b/data_from_portwine/data_from_portwine.tar.gz deleted file mode 100644 index 1e4f928..0000000 Binary files a/data_from_portwine/data_from_portwine.tar.gz and /dev/null differ diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 0b41b2c..8110f1d 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -629,10 +629,13 @@ PW_INIT_PFX () { KILL_PORTWINE PW_STOP_PROGRESS_BAR PW_START_PROGRESS_BAR_CS "Initialization prefix..." - fi + fi if [ ! -d "${PORT_WINE_PATH}/data/pfx/drive_c/users/${USER}" ]; then try_force_link_dir "${PORT_WINE_PATH}/data/pfx/drive_c/users/steamuser" "${PORT_WINE_PATH}/data/pfx/drive_c/users/${USER}" fi + if [ ! -d "${PORT_WINE_PATH}/drive_c" ]; then + try_force_link_dir "${PORT_WINE_PATH}/data/pfx/drive_c/" "${PORT_WINE_PATH}/" + fi create_new_dir "${WINEPREFIX}/drive_c/windows/Fonts/" try_copy_file "${WINEDIR}/share/fonts/"LiberationSans-Regular.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"arial.ttf @@ -803,7 +806,7 @@ export WINELIB="${HOME}/.PortWINE/libs${pw_libs_ver}" export WINEPREFIX="${PORT_WINE_PATH}/data/pfx" export PW_COMPAT_MEDIA_PATH="${PORT_WINE_TMP_PATH}" export WINE_WIN_START="${WINEPREFIX}/drive_c/windows/system32/start.exe" -export PW_RUNTIME="${WINELIB}/run-in-soldier --remove-game-overlay --share-home --runtime=runtime --" +export PW_RUNTIME="${WINELIB}/run-in-soldier --remove-game-overlay --share-home --filesystem="${PORT_WINE_PATH}" --runtime=runtime --" export PW_GUI_ICON_PATH="${PORT_WINE_PATH}/data/img/gui" export PW_VULKAN_DLL="${HOME}/.PortWINE/vulkan" export PW_DXVK_VER="${PW_DEF_DXVK_VER}" diff --git a/data_from_portwine/scripts/setup.sh b/data_from_portwine/scripts/setup.sh index 398a3ab..8f382fa 100755 --- a/data_from_portwine/scripts/setup.sh +++ b/data_from_portwine/scripts/setup.sh @@ -57,8 +57,6 @@ do done chmod u+x "${PORT_SCRIPTS_PATH}/"* -try_force_link_dir "${PORT_WINE_PATH}/data/pfx/drive_c/" "${PORT_WINE_PATH}/" - if [ "${s_install}" = "1" ]; then echo "Installation completed successfully." else diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 88aacb1..0e85655 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -23,7 +23,7 @@ export WINEARCH="win64" export mono_ver=6.1.2 export gecko_ver=2.47.2 -export pw_libs_ver="_v13" +export pw_libs_ver="_v14" export PW_FORCE_LARGE_ADDRESS_AWARE=1