diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index d4c8647..c5a8f25 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,14 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2248### Date: 26.01.2024 / Download update size: 8 megabytes +* creating a shortcut in the "MENU -> Games" is separate from creating on the "Desktop" +* added a condition for using fonts from WINE Proton only if there are no original fonts in the prefix +* fixed the choice of installing libraries in the PortProton prefix manager +* the creation of symlinks in PortProton has been transferred from direct paths to relative ones +* added the "VKBASALT_USER_CONF" setting to use vkBasalt system settings (thanks Arta48) +* updated the "EVE Online Launcher" installer to the current version (thanks cefeiko) + ###Scripts version 2247### Date: 23.01.2024 / Download update size: 8 megabytes * improved operation of the portable version of gamemode * added cleaning of the data/tmp directory from broken (undocumented) archives before launching PortProton diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index b692f58..1df1004 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,14 @@ ----------------------------------------- История изменений: +###Scripts version 2248### Дата: 26.01.2024 / Размер скачиваемого обновления: 8 мегабайт +* создание ярлыка в "МЕНЮ -> Игры" отделены от создания на "Рабочем столе" +* добавлено условие использования шрифтов из WINE Proton, только если нет оригинальных шрифтов в префиксе +* исправлен выбор установки библиотек в префикс менеджере PortProton +* создание симлинков в PortProton переведены с прямых путей, на относительные +* добавлена настройка "VKBASALT_USER_CONF" для использования системных настроек vkBasalt (спасибо Arta48) +* обновлен установщик "EVE Online Launcher" на актуальную версию (спасибо cefeiko) + ###Scripts version 2247### Дата: 23.01.2024 / Размер скачиваемого обновления: 8 мегабайт * улучшена работа портативной версии gamemode * исправление опечаток diff --git a/data_from_portwine/img/gui/eve.png b/data_from_portwine/img/gui/eve.png index 97f9390..29488bc 100644 Binary files a/data_from_portwine/img/gui/eve.png and b/data_from_portwine/img/gui/eve.png differ diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index a0d1029..049a2c6 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -77,7 +77,7 @@ try_force_link_file () { if [ ! -f "$1" ] ; then : elif [ -z "$2" ] ; then print_error "no way to link file $1" else - ln -sf "$1" "$2" + ln -s -f -r "$1" "$2" [ "$?" != 0 ] && print_error "failed to link file $1 to $2" || return 0 fi return 1 @@ -102,7 +102,7 @@ try_force_link_dir () { if [ ! -d "$1" ] ; then print_info "directory $1 not found for link" elif [ -z "$2" ] ; then print_error "no way to link directory $1" else - ln -sf "$1" "$2" + ln -s -f -r "$1" "$2" [ "$?" != 0 ] && print_error "failed to link directory $1 to $2" || return 0 fi return 1 @@ -493,6 +493,7 @@ pw_init_runtime () { export PRESSURE_VESSEL_RUNTIME_BASE="${PW_WINELIB}" export PRESSURE_VESSEL_VARIABLE_DIR="${PW_WINELIB}/var" export PRESSURE_VESSEL_PREFIX="${PW_WINELIB}/pressure-vessel" + export FONTCONFIG_PATH='' unset PRESSURE_VESSEL_FILESYSTEMS_RO PRESSURE_VESSEL_FILESYSTEMS_RW for PWRTMRO in ${PW_RT_MOUNT_RO[*]} ; do diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index d3fac7a..f7b6e10 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -60,7 +60,8 @@ if [[ "${update_loc}" == "RUS" ]] ; then export inst_set_top="Установка ${portname}" export sc_info="Ярлык будет создан в каталоге ${portname}." export sc_name="Название" - export sc_menu_desktop="Добавить ярлык в МЕНЮ -> Игры и на Рабочий стол" + export sc_menu_desktop="Добавить ярлык в МЕНЮ -> Игры" + export sc_desktop_desktop="Добавить ярлык на Рабочий стол" export sc_add_in_steam="Добавить ярлык в библиотеку STEAM" export sc_restert_steam="Для добавления ярлыка в STEAM, необходим перезапуск.\n\nПерезапустить STEAM?" @@ -462,7 +463,8 @@ elif [[ "${update_loc}" == "ENG" ]] ; then export inst_set_top="Instaling ${portname}" export sc_info="The shortcut will be created in the ${portname} directory." export sc_name="Name" - export sc_menu_desktop="Add shortcut to MENU -> GAMES and Desktop" + export sc_menu_desktop="Add shortcut to MENU -> GAMES" + export sc_desktop_desktop="Add shortcut to Desktop" export sc_add_in_steam="Add shortcut to STEAM library" export sc_restert_steam="For adding shortcut to STEAM, needed restart.\n\nRestart STEAM now?" diff --git a/data_from_portwine/scripts/portwine_db/eve b/data_from_portwine/scripts/portwine_db/eve index a35601e..1ad2681 100755 --- a/data_from_portwine/scripts/portwine_db/eve +++ b/data_from_portwine/scripts/portwine_db/eve @@ -2,8 +2,19 @@ #Author: linux-gaming.ru #eve.exe #evelauncher.exe +#eve-online.exe #Rating=5 #####################examples########################### -export PW_VULKAN_USE=1 -export PW_DLL_INSTALL="vcrun2019 d3dcompiler_47" # Install DLL in port prefix (used winetricks) -export WINEDLLOVERRIDES="concrt140,msvcp140,msvcp140_1,msvcp140_2,d3dcompiler_47=n" +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_GSTREAMER="0" +export PW_PREFIX_NAME="EVE_ONLINE" +export PW_WINE_FULLSCREEN_FSR="0" +export PW_USE_D3D_EXTRAS="1" +export PW_FORCE_LARGE_ADDRESS_AWARE="0" +export PW_USE_SHADER_CACHE="0" +export PW_USE_EAC_AND_BE="1" +export PW_DLL_INSTALL="vcrun2022 d3dcompiler_47 tahoma arial" # msdelta +export WINEDLLOVERRIDES="msvcp140,msvcp140_1=n" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EVE b/data_from_portwine/scripts/pw_autoinstall/PW_EVE index 651aac4..d4e2fbf 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_EVE +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EVE @@ -1,15 +1,44 @@ #!/usr/bin/env bash # Author: cefeiko ######################################################################## -export PW_WINDOWS_VER=10 -export PW_DLL_INSTALL="vcrun2017" -export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/EveLauncher-2198233.exe" +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_GSTREAMER="0" +export PW_PREFIX_NAME="EVE_ONLINE" +export PW_WINE_FULLSCREEN_FSR="0" +export PW_USE_GAMEMODE="0" +export PW_USE_D3D_EXTRAS="1" +export PW_FORCE_LARGE_ADDRESS_AWARE="0" +export PW_USE_SHADER_CACHE="0" +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_game "https://binaries.eveonline.com/EveLauncher-2198233.exe" "${PW_AUTOINSTALL_EXE}" -then - pw_kill_autostart evelauncher.exe & - pw_run "${PW_AUTOINSTALL_EXE}" - portwine_exe=`find "$WINEPREFIX/drive_c/" -type f -name "evelauncher.exe"` +if try_download_game "https://launcher.ccpgames.com/eve-online/release/win32/x64/eve-online-latest+Setup.exe" "${PW_AUTOINSTALL_EXE}" ; then + pw_start_progress_bar_block "${loc_gui_installing_the} EVE Online Launcher. ${loc_gui_please_wait} " + 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 + + APP_DIR="app-`cat "${EVE_LAUNCHER_DIR}/RELEASES" | awk '{print $2}' | awk -F"-" '{print $3}'`" + + create_new_dir "${EVE_LAUNCHER_DIR}/$APP_DIR" + 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 "${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" + + portwine_exe="${EVE_LAUNCHER_DIR}/eve-online.exe" pw_stop_progress_bar portwine_create_shortcut try_remove_file "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 6e50427..227a8ef 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -302,7 +302,9 @@ start_portwine () { create_new_dir "${WINEPREFIX}/drive_c/windows/Fonts/" LN_FONTS="arialbd.ttf courbd.ttf georgia.ttf micross.ttf msyh.ttf simsun.ttc arial.ttf cour.ttf malgun.ttf msgothic.ttc nirmala.ttf times.ttf" for link_font in $LN_FONTS ; do - try_force_link_file "${WINEDIR}/share/fonts/${link_font}" "${WINEPREFIX}/drive_c/windows/Fonts/${link_font}" + if [[ ! -f "${WINEPREFIX}/drive_c/windows/Fonts/${link_font}" ]] ; then + try_force_link_file "${WINEDIR}/share/fonts/${link_font}" "${WINEPREFIX}/drive_c/windows/Fonts/${link_font}" + fi done find "${WINEPREFIX}/dosdevices" -xtype l -maxdepth 1 2>/dev/null -exec rm {} \; @@ -638,7 +640,7 @@ start_portwine () { echo "START WINETRICKS..." >> "${PORT_WINE_TMP_PATH}/update_pfx_log" echo "Try to install DLL in prefix: ${PW_DLL_NEED_INSTALL}" >> "${PORT_WINE_TMP_PATH}/update_pfx_log" print_info "Try to install DLL in prefix: ${PW_DLL_NEED_INSTALL}" - ${pw_runtime} env PATH="${PATH}" LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \ + ${pw_runtime} env PATH="${PATH}" LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" GST_PLUGIN_SYSTEM_PATH_1_0="" \ "${PORT_WINE_TMP_PATH}/winetricks" -q -r -f ${PW_DLL_NEED_INSTALL} &>>"${PORT_WINE_TMP_PATH}/update_pfx_log" wait_wineserver kill_portwine @@ -649,7 +651,7 @@ start_portwine () { if [[ ! -z "${PW_WINDOWS_VER}" && `echo "$PW_WINDOWS_VER" | sed 's/.*/\L&/'` == "xp" ]] ; then export PW_WINDOWS_VER="xp64" fi - ${pw_runtime} env PATH="${PATH}" LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \ + ${pw_runtime} env PATH="${PATH}" LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" GST_PLUGIN_SYSTEM_PATH_1_0="" \ "${WINELOADER}" winecfg -v `echo "win${PW_WINDOWS_VER}" | sed 's/.*/\L&/'` wait_wineserver kill_portwine diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index d8d16d7..25c211a 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -255,6 +255,7 @@ portwine_start_debug () { pw_winecfg () { start_portwine + export GST_PLUGIN_SYSTEM_PATH_1_0="" pw_run winecfg } @@ -273,6 +274,7 @@ pw_winecmd () { pw_winereg () { start_portwine + export GST_PLUGIN_SYSTEM_PATH_1_0="" pw_run regedit } @@ -362,8 +364,8 @@ pw_prefix_manager () { if [[ ! -z ${SET_FROM_PFX_MANAGER} ]] ; then export PW_ADD_TO_ARGS_IN_RUNTIME="--xterm" pw_init_runtime - ${pw_runtime} env PATH="${PATH}" LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \ - "${PORT_WINE_TMP_PATH}/winetricks" -q -r -f ${PW_DLL_NEED_INSTALL} &>>"${PORT_WINE_TMP_PATH}/update_pfx_log" + ${pw_runtime} env PATH="${PATH}" LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" GST_PLUGIN_SYSTEM_PATH_1_0="" \ + "${PORT_WINE_TMP_PATH}/winetricks" -q -r -f ${SET_FROM_PFX_MANAGER} &>>"${PORT_WINE_TMP_PATH}/update_pfx_log" gui_prefix_manager else print_info "Nothing to do. Restarting PortProton..." @@ -395,7 +397,8 @@ pw_winetricks () { fi done < "${PORT_WINE_TMP_PATH}/update_pfx_log" | "${pw_yad_v12_3}" --text-info --tail --no-buttons --title="WINETRICKS" \ --auto-close --skip-taskbar --width=$PW_GIF_SIZE_X --height=$PW_GIF_SIZE_Y 2>/dev/null & - "${PORT_WINE_TMP_PATH}/winetricks" -q -r -f &>>"${PORT_WINE_TMP_PATH}/update_pfx_log" + ${pw_runtime} env PATH="${PATH}" LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" GST_PLUGIN_SYSTEM_PATH_1_0="" \ + "${PORT_WINE_TMP_PATH}/winetricks" -q -r -f ${PW_DLL_NEED_INSTALL} &>>"${PORT_WINE_TMP_PATH}/update_pfx_log" try_remove_file "${PORT_WINE_TMP_PATH}/update_pfx_log" kill -s SIGTERM "$(pgrep -a yad_v12_3 | grep "title=WINETRICKS" | awk '{print $1}')" > /dev/null 2>&1 stop_portwine diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 1c41a58..bdb76d9 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=2247 +#SCRIPTS_NEXT_VERSION=2248 ######################################################################## export PW_MANGOHUD="0" export DEFAULT_MANGOHUD_CONFIG="cpu_stats,cpu_temp,cpu_mhz,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,vram,ram,frame_timing=1,time,arch,wine,toggle_hud=Shift_R+F12,resolution,vkbasalt,gamemode" diff --git a/data_from_portwine/scripts/zen_yad_gui b/data_from_portwine/scripts/zen_yad_gui index 8170d92..e97f305 100755 --- a/data_from_portwine/scripts/zen_yad_gui +++ b/data_from_portwine/scripts/zen_yad_gui @@ -623,6 +623,7 @@ portwine_create_shortcut () { --field="${sc_info}":LBL "" \ --field=" ${name_desktop}":LBL "" \ --field=" ${sc_menu_desktop}":CHK "TRUE" \ + --field=" ${sc_desktop_desktop}":CHK "TRUE" \ --field=" ${sc_add_in_steam}":CHK "FALSE" \ --button="$loc_gui_create_shortcut":0) PW_YAD_OUT=$? @@ -634,6 +635,7 @@ portwine_create_shortcut () { --field="${sc_info}":LBL "" \ --field="${sc_name}:" "${name_desktop}" \ --field=" ${sc_menu_desktop}":CHK "TRUE" \ + --field=" ${sc_desktop_desktop}":CHK "TRUE" \ --field=" ${sc_add_in_steam}":CHK "FALSE" \ --button="$loc_gui_create_shortcut":0) PW_YAD_OUT=$? @@ -645,7 +647,8 @@ portwine_create_shortcut () { else name_desktop=$(echo "$OUTPUT" | awk -F'|' '{print $2}') fi create_menu_desktop_shortcut=$(echo "$OUTPUT" | awk -F'|' '{print $3}') - create_menu_steam_shortcut=$(echo "$OUTPUT" | awk -F'|' '{print $4}') + create_desktop_desktop_shortcut=$(echo "$OUTPUT" | awk -F'|' '{print $4}') + create_menu_steam_shortcut=$(echo "$OUTPUT" | awk -F'|' '{print $5}') try_remove_file "${PORT_WINE_PATH}/${name_desktop}.desktop" @@ -663,9 +666,12 @@ portwine_create_shortcut () { echo "Icon="${PORT_WINE_PATH}/data/img/${name_desktop}.png"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" chmod u+x "${PORT_WINE_PATH}/${name_desktop}.desktop" - if [[ "${create_menu_desktop_shortcut}" == "TRUE" ]]; then + if [[ "${create_menu_desktop_shortcut}" == "TRUE" ]] ; then try_remove_file "${HOME}/.local/share/applications/${name_desktop}.desktop" cp -f "${PORT_WINE_PATH}/${name_desktop}.desktop" "${HOME}/.local/share/applications/" + fi + + if [[ "${create_desktop_desktop_shortcut}" == "TRUE" ]] ; then if [[ -d "${HOME}/Desktop" ]] ; then cp -f "${PORT_WINE_PATH}/${name_desktop}.desktop" "${HOME}/Desktop/" elif [[ -d "${HOME}/Рабочий стол" ]] ; then