From d992080a2e8a63887de3af7f3221a44b3c8fd87f Mon Sep 17 00:00:00 2001 From: castro-fidel Date: Sun, 17 Apr 2022 22:31:04 +0300 Subject: [PATCH] Scripts version 2102 --- data_from_portwine/changelog_eng | 11 ++++++- data_from_portwine/changelog_rus | 21 +++++++++----- data_from_portwine/scripts/functions_helper | 25 +++++++++------- data_from_portwine/scripts/lang | 4 +-- .../scripts/portwine_db/League of Legends | 2 +- data_from_portwine/scripts/portwine_db/Origin | 2 +- .../portwine_db/gothic-ii-gold-edition | 2 +- .../medal-of-honor-allied-assault-war-chest | 2 +- .../scripts/pw_autoinstall/PW_ANKAMA | 2 +- .../scripts/pw_autoinstall/PW_BATTLE_NET | 2 +- .../scripts/pw_autoinstall/PW_BETHESDA | 2 +- .../scripts/pw_autoinstall/PW_CITRA | 2 +- .../scripts/pw_autoinstall/PW_DOLPHIN | 2 +- .../scripts/pw_autoinstall/PW_DUCKSTATION | 2 +- .../scripts/pw_autoinstall/PW_EPIC | 2 +- .../scripts/pw_autoinstall/PW_EPSXE | 2 +- .../scripts/pw_autoinstall/PW_EVE | 2 +- .../scripts/pw_autoinstall/PW_GAMEFORGE | 2 +- .../scripts/pw_autoinstall/PW_GLYPH | 2 +- .../scripts/pw_autoinstall/PW_GOG | 2 +- .../scripts/pw_autoinstall/PW_ITCH | 2 +- .../scripts/pw_autoinstall/PW_LOL | 4 +-- .../scripts/pw_autoinstall/PW_MAME | 2 +- .../scripts/pw_autoinstall/PW_MYGAMES | 2 +- .../scripts/pw_autoinstall/PW_ORIGIN | 2 +- .../scripts/pw_autoinstall/PW_OSU | 2 +- .../scripts/pw_autoinstall/PW_PPSSPP | 2 +- .../scripts/pw_autoinstall/PW_PROJECT64 | 2 +- .../scripts/pw_autoinstall/PW_RETROARCH | 2 +- .../scripts/pw_autoinstall/PW_ROCKSTAR | 2 +- .../scripts/pw_autoinstall/PW_SCUMMVM | 4 +-- .../scripts/pw_autoinstall/PW_STEAM | 2 +- .../scripts/pw_autoinstall/PW_UBC | 2 +- .../scripts/pw_autoinstall/PW_VBA-M | 2 +- .../scripts/pw_autoinstall/PW_WGC | 2 +- .../scripts/pw_autoinstall/PW_WOSB | 4 +-- .../scripts/pw_autoinstall/PW_YABAUSE | 2 +- data_from_portwine/scripts/runlib | 29 ++++++++++++------- data_from_portwine/scripts/setup.sh | 2 +- data_from_portwine/scripts/start.sh | 10 +++---- data_from_portwine/scripts/var | 6 ++-- data_from_portwine/scripts/zen_yad_gui | 8 ++--- 42 files changed, 106 insertions(+), 82 deletions(-) diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 33f7074..3ee7ce8 100644 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -1,7 +1,16 @@ -You can help us in the development of the project on the website: https://boosty.to/portwine-linux.ru +You can help us in the development of the project on the website: boosty.to/portwine-linux.ru ----------------------------------------- Changelog: +###Scripts version 2102### +* fixed work of GALLIUM_NINE on integrated video cards from Intel +* fixed switching AMDVLK - RADV +* FPS increase in games up to 20% (for all launch modes) + +###Scripts version 2101### +* fix work WINETRICKS (new prefix manager) in the absence of winetricks.log +* updated "libs_v28" (MANGOHUD update to version 0.6.6-1) + ###Scripts version 2100### * updated "libs_v27" (unification of library directories for different Linux OS) * MANGOHUD works again in OPENGL mode diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 0dde81f..24b4b9d 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -1,7 +1,12 @@ -Вы можете помочь развитию проекта: https://portwine-linux.ru/donate/ +Вы можете помочь развитию проекта: portwine-linux.ru/donate/ ----------------------------------------- История изменений: +###Scripts version 2102### +* исправлена работа GALLIUM_NINE на интегрированных видеокатрах от Intel +* исправлено переключение AMDVLK - RADV +* увеличениние FPS в играх до 20% (для всех режимов запуска) + ###Scripts version 2101### * фикс работы WINETRICKS (новый prefix manager) при отсутствии winetricks.log * обновлен "libs_v28" (обновление MANGOHUD до версии 0.6.6-1) @@ -393,7 +398,7 @@ PS: Cefeiko - отдельный респект за помощь в отлов ###Scripts version 2014### * обновлен WINE PROTON_STEAM до версии 6.3-7 совместно с DXVK и VKD3D -* реализован запуск League Of Legends (необходимо запускать с версией wine: https://github.com/Castro-Fidel/wine_builds/releases/download/WINE_LOL_GE_6.16-2/WINE_LOL_GE_6.16-2.tar.xz ) +* реализован запуск League Of Legends (необходимо запускать с версией wine: github.com/Castro-Fidel/wine_builds/releases/download/WINE_LOL_GE_6.16-2/WINE_LOL_GE_6.16-2.tar.xz ) ###Scripts version 2013### * добавлен автоматический перенос содержимого каталога ~/.PortWINE в ../PortProton/data/tmp @@ -405,7 +410,7 @@ PS: Cefeiko - отдельный респект за помощь в отлов ###PortProton-96### 16.09.2021 ###Scripts version 2012### --- TEST --- * PortProton переведен в режим обновлений "rolling release": - проверка и обновление скриптов в приоритете перед другими обновлениями - - создана ветка https://github.com/Castro-Fidel/wine_builds/releases + - создана ветка github.com/Castro-Fidel/wine_builds/releases - реализован функционал позволяющий добавлять любую версию WINE/PROTON/GE/LUTRIS в каталог dist и эта версия автоматически появиться при выборе в графическом интерфейсе - обновлен скрипт установки порта * проверка версии PortProton перенесена с ftp на github @@ -522,7 +527,7 @@ PS: не забывает для активации добавить перем * добавлен пользовательский файл конфигурации (путь_до_PortProton/data/user.conf) который при наполнениии замещает настройки скрипта var и db файлов, но при обновлении скриптов остается неизменным, для сохранения ваших настроек. * автоматическое изменение раскладки клавиатуры работает только при установке значении переменной export PW_XKBD_RU_HACK=1 (можно прописывать как в скрипт var, так и в user.conf) * HOTFIX - определение месторасполажения установленных шейдеров для vkBasalt (для работы под Arch и Manjaro) -* проверка и обновления скриптов из https://github.com/Castro-Fidel/PortWINE/archive/refs/heads/master.tar.gz +* проверка и обновления скриптов из github.com/Castro-Fidel/PortWINE/archive/refs/heads/master.tar.gz ###Scripts version 1113### * обновлен dxvk до v1.9-51 @@ -880,7 +885,7 @@ PS: не забывает для активации добавить перем * убран xterm из debug (иначе ломает шрифты) * добавлена кнопка редактирования найденного db файла * ТЕСТ: автоудаление PINNED_LIBS и отключение setup.sh --force -* изменение сравнения версий скриптов и портов "$(curl -s --list-only "https://portwine-linux.ru/ftp/current_version/blabla_ver")" +* изменение сравнения версий скриптов и портов "$(curl -s --list-only "portwine-linux.ru/ftp/current_version/blabla_ver")" * автоматическая установка в префикс порта PW_DLL_INSTALL="vcrun2017 mfc42" * исправлено создание db файла при создании ярлыков, в именах которых присутствует одниковвые названия запускаемого файла * исправили создания префикса на некоторых системах при использования встроенного xterm из ~/PortWINE/libs @@ -892,7 +897,7 @@ PS: не забывает для активации добавить перем * добавлен прогресс загрузки библиотек с интернета * добавлен в debug полный путь до запускаемой игры/программы вместе с именем файла * исправлено дублирование db файлов при создании ярлыков -* перенос libs с сервера PortWINE-Linux.ru на https://github.com/Castro-Fidel/PortWINE/releases/ +* перенос libs с сервера PortWINE-Linux.ru на github.com/Castro-Fidel/PortWINE/releases/ * скачивание mono оф. github mono * скачивание gecko оф. ftp winehq * в /data/scripts/vars/PortProton_vars добавлена переменная PW_MANGOHUD=1 что включает HUD для монитроринга FPS, нагрузку на CPU, GPU и т.п (при условии что в системе предустановлен пакет mangohud) @@ -937,5 +942,5 @@ PS: не забывает для активации добавить перем * добавлена интеграция PortProton в рабочее окружение (root права не нужны, концепция порта не изменилась) ###ЗАМЕТКИ### -* проверка версий dxvk на github: curl -s https://github.com/doitsujin/dxvk/releases | grep Version | awk {'print $3'} | sed 's%%%g' -* проверка версий vkd3d на github: curl -s https://github.com/HansKristian-Work/vkd3d-proton/releases | grep Version | awk {'print $3'} | sed 's%%%g' +* проверка версий dxvk на github: curl -s github.com/doitsujin/dxvk/releases | grep Version | awk {'print $3'} | sed 's%%%g' +* проверка версий vkd3d на github: curl -s github.com/HansKristian-Work/vkd3d-proton/releases | grep Version | awk {'print $3'} | sed 's%%%g' diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index a6b663b..899d9a7 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -301,7 +301,10 @@ init_wine_ver () { mv -f "${WINEDIR}/lib/wine/x86_64-unix" "${WINEDIR}/lib64/wine/" mv -f "${WINEDIR}/lib/wine/x86_64-windows" "${WINEDIR}/lib64/wine/" fi - + + try_remove_file "${WINEDIR}/lib/libsteam_api.so" + try_remove_file "${WINEDIR}/lib64/libsteam_api.so" + for copy_proton_dll in "dxvk" "vkd3d-proton" ; do if [[ ! -d "${WINEDIR}/lib/wine/${copy_proton_dll}/" || ! -d "${WINEDIR}/lib64/wine/${copy_proton_dll}/" ]] ; then try_copy_dir "${PORT_WINE_PATH}/data/dist/${PW_PROTON_GE_VER}/lib/wine/${copy_proton_dll}" "${WINEDIR}/lib/wine/" @@ -382,11 +385,11 @@ pw_init_runtime () { ${PW_ADD_TO_ARGS_IN_RUNTIME} --" fi - export PRESSURE_VESSEL_GC_RUNTIMES=0 - export PRESSURE_VESSEL_COPY_RUNTIME=0 - export PRESSURE_VESSEL_GC_LEGACY_RUNTIMES=0 - export PRESSURE_VESSEL_REMOVE_GAME_OVERLAY=0 - export PRESSURE_VESSEL_IMPORT_VULKAN_LAYERS=0 + export PRESSURE_VESSEL_GC_RUNTIMES=1 + export PRESSURE_VESSEL_COPY_RUNTIME=1 + export PRESSURE_VESSEL_GC_LEGACY_RUNTIMES=1 + export PRESSURE_VESSEL_REMOVE_GAME_OVERLAY=1 + export PRESSURE_VESSEL_IMPORT_VULKAN_LAYERS=1 unset PRESSURE_VESSEL_RUNTIME_ARCHIVE export PRESSURE_VESSEL_RUNTIME=runtime @@ -563,7 +566,7 @@ pw_download_libs () { || ! -e "${PW_WINELIB}/runtime/files/bin/vkcube" || -e "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}.tar.xz" ]] ; then print_info "Download and install libraries..." - if try_download "https://github.com/Castro-Fidel/PortWINE/releases/download/libs${PW_LIBS_VER}/libs${PW_LIBS_VER}.tar.xz" "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}.tar.xz" ; then + if try_download "github.com/Castro-Fidel/PortWINE/releases/download/libs${PW_LIBS_VER}/libs${PW_LIBS_VER}.tar.xz" "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}.tar.xz" ; then if unpack_tar_xz "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}.tar.xz" "${PORT_WINE_TMP_PATH}/" ; then try_remove_file "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}.tar.xz" else @@ -600,7 +603,7 @@ pw_check_and_download_wine () { fi if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then print_info "Download and install ${PW_WINE_USE}..." - if try_download "https://github.com/Castro-Fidel/wine_builds/releases/download/${PW_WINE_USE}/${PW_WINE_USE}.tar.xz" "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" ; then + if try_download "github.com/Castro-Fidel/wine_builds/releases/download/${PW_WINE_USE}/${PW_WINE_USE}.tar.xz" "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" ; then if unpack_tar_xz "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" "${PORT_WINE_PATH}/data/dist/" ; then echo "${PW_WINE_USE}" > "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}/version" try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" @@ -629,7 +632,7 @@ pw_check_and_download_plugins () { || ! -d "${PW_PLUGINS_PATH}/nvapi" || ! -d "${PW_PLUGINS_PATH}/nvml" ]] then print_info "Download and install plugins${PW_PLUGINS_VER}..." - if try_download "https://github.com/Castro-Fidel/wine_builds/releases/download/plugins${PW_PLUGINS_VER}/plugins${PW_PLUGINS_VER}.tar.xz" "${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}.tar.xz" ; then + if try_download "github.com/Castro-Fidel/wine_builds/releases/download/plugins${PW_PLUGINS_VER}/plugins${PW_PLUGINS_VER}.tar.xz" "${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}.tar.xz" ; then if unpack_tar_xz "${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}.tar.xz" "${PORT_WINE_TMP_PATH}" ; then try_remove_file "${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}.tar.xz" else @@ -735,7 +738,7 @@ pw_port_update () { echo "######################################################" print_info "Update scripts..." try_remove_file "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz" - if try_download "https://github.com/Castro-Fidel/PortWINE/archive/refs/heads/master.tar.gz" "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz" ; then + if try_download "github.com/Castro-Fidel/PortWINE/archive/refs/heads/master.tar.gz" "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz" ; then if unpack_tar_gz "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz" "${PORT_WINE_TMP_PATH}" then create_new_dir "${PORT_WINE_TMP_PATH}/scripts_backup" @@ -769,7 +772,7 @@ pw_port_update () { update_winetricks () { - W_TRX_URL="https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks" + W_TRX_URL="raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks" W_TRX_EXT_VER="$(curl -s --list-only ${W_TRX_URL} | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')" print_info "Version winetricks on server: ${W_TRX_EXT_VER}" W_TRX_INT_VER="$(cat "${PORT_WINE_TMP_PATH}/winetricks" | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')" diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index 4ad6b94..0e192c9 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -35,7 +35,7 @@ then export port_del2="Вы действительно хотите полностью удалить PortProton?" export port_deb1="PortWINE был запущен в режиме создания ${portname}.log и он успешно сохранен в корне каталога порта" - export port_deb2="Для диагностики проблемы, скопируйте ВЕСЬ лог в соответствующий канал у нас на сервере дискорда: https://discord.gg/FTaheP99wE" + export port_deb2="Для диагностики проблемы, скопируйте ВЕСЬ лог в соответствующий канал у нас на сервере дискорда: discord.gg/FTaheP99wE" export port_start1="Запуск PortWINE" export port_start2="В каком режиме вы хотите запустить PortWINE?" @@ -145,7 +145,7 @@ then export port_del2="Are you sure you want to delete the PortProton" export port_deb1="PortWINE was launched in creation mode ${portname}.log and it is successfully stored in the root directory of the port" - export port_deb2="To diagnose the problem, copy ALL of the log to discord server: https://discord.gg/FTaheP99wE" + export port_deb2="To diagnose the problem, copy ALL of the log to discord server: discord.gg/FTaheP99wE" export port_start1="Starting the PortWINE" export port_start2="In what mode you want to start the PortWINE?" diff --git a/data_from_portwine/scripts/portwine_db/League of Legends b/data_from_portwine/scripts/portwine_db/League of Legends index 8aed332..4934bb8 100755 --- a/data_from_portwine/scripts/portwine_db/League of Legends +++ b/data_from_portwine/scripts/portwine_db/League of Legends @@ -44,7 +44,7 @@ export PW_NO_ESYNC=1 # Do not use eventfd-based in-pr check_download_wine_ver_for_lol () { if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then - if try_download "https://github.com/Castro-Fidel/wine_builds/releases/download/${PW_WINE_USE}/${PW_WINE_USE}.tar.xz" \ + if try_download "github.com/Castro-Fidel/wine_builds/releases/download/${PW_WINE_USE}/${PW_WINE_USE}.tar.xz" \ "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" ; then if unpack_tar_xz "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" "${PORT_WINE_PATH}/data/dist/" ; then try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" diff --git a/data_from_portwine/scripts/portwine_db/Origin b/data_from_portwine/scripts/portwine_db/Origin index 6544f07..08ff6b8 100755 --- a/data_from_portwine/scripts/portwine_db/Origin +++ b/data_from_portwine/scripts/portwine_db/Origin @@ -46,7 +46,7 @@ export STAGING_SHARED_MEMORY=0 #add_in_start_portwine () { # export PW_USER_TEMP="$WINEPREFIX/drive_c/users/${USER}/Temp" -# if try_download "https://download.dm.origin.com/origin/live/OriginSetup.exe" "${PW_USER_TEMP}/OriginSetup.exe" ; then +# if try_download "download.dm.origin.com/origin/live/OriginSetup.exe" "${PW_USER_TEMP}/OriginSetup.exe" ; then # pw_start_progress_bar_block "Extracting files for update the Origin..." # unzip "${PW_USER_TEMP}/OriginSetup.exe" 'update/*.zip' -d "${PW_USER_TEMP}/" # unzip -o "${PW_USER_TEMP}/update/"*.zip -d "$WINEPREFIX/drive_c/Program Files (x86)/Origin/" diff --git a/data_from_portwine/scripts/portwine_db/gothic-ii-gold-edition b/data_from_portwine/scripts/portwine_db/gothic-ii-gold-edition index 9bc8206..5c9f782 100755 --- a/data_from_portwine/scripts/portwine_db/gothic-ii-gold-edition +++ b/data_from_portwine/scripts/portwine_db/gothic-ii-gold-edition @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Ridbowt - #Sources: https://lutris.net/games/gothic-ii-gold-edition/ + #Sources: lutris.net/games/gothic-ii-gold-edition/ #GothicStarter.exe #Gothic2.exe #Rating=1-5 diff --git a/data_from_portwine/scripts/portwine_db/medal-of-honor-allied-assault-war-chest b/data_from_portwine/scripts/portwine_db/medal-of-honor-allied-assault-war-chest index 5e4939a..175b6d5 100755 --- a/data_from_portwine/scripts/portwine_db/medal-of-honor-allied-assault-war-chest +++ b/data_from_portwine/scripts/portwine_db/medal-of-honor-allied-assault-war-chest @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Ridbowt (Nikola P.) -#Sources: https://www.gog.com/forum/medal_of_honor_series/moh_dont_start_on_linux/post2 + https://lutris.net/games/medal-of-honor-allied-assault-war-chest/ + https://www.playground.ru/medal_of_honor_allied_assault/cheat/medal_of_honor_allied_assault_sovet_lyuboe_razreshenie_dalnost_prorisovki_pole_obzora_fov_pravilnoe_otkrytie_vseh_medalej-816472 +#Sources: www.gog.com/forum/medal_of_honor_series/moh_dont_start_on_linux/post2 + lutris.net/games/medal-of-honor-allied-assault-war-chest/ + www.playground.ru/medal_of_honor_allied_assault/cheat/medal_of_honor_allied_assault_sovet_lyuboe_razreshenie_dalnost_prorisovki_pole_obzora_fov_pravilnoe_otkrytie_vseh_medalej-816472 #Comment: Резервные копии кофиг-файлов находятся в корне игры, в каталогах "/Medal of Honor/main/" + "/Medal of Honor/main/configs/", "/Medal of Honor/mainta/" + "/Medal of Honor/mainta/configs/", "/Medal of Honor/maintt/" + "/Medal of Honor/maintt/configs/". Чтобы восстановить исходные конфигурации - просто удалите в этих каталогах файлы newconfig.cfg и unnamedsoldier.cfg; после этого удалите расширение .bak у файлов newconfig.cfg.bak и unnamedsoldier.cfg.bak. #MOHAA.exe #moh_spearhead.exe diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ANKAMA b/data_from_portwine/scripts/pw_autoinstall/PW_ANKAMA index 01f5524..bdc0819 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_ANKAMA +++ b/data_from_portwine/scripts/pw_autoinstall/PW_ANKAMA @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("/S") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Ankama Launcher-Setup.exe" start_portwine -if try_download "https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Installing the Ankama Launcher. Please wait..." pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET b/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET index bb97e24..6f9b362 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET +++ b/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET @@ -4,7 +4,7 @@ [ "${update_loc}" = "RUS" ] && export BN_LOC=ruRU || export BN_LOC=enUS export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Battle.net-Setup-${BN_LOC}.exe" start_portwine -if try_download "http://dist.blizzard.com/downloads/bna-installers/322d5bb9ae0318de3d4cde7641c96425/retail.1/Battle.net-Setup-${BN_LOC}.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "dist.blizzard.com/downloads/bna-installers/322d5bb9ae0318de3d4cde7641c96425/retail.1/Battle.net-Setup-${BN_LOC}.exe" "${PW_AUTOINSTALL_EXE}" then PW_START_PROGRESS_BAR "Installing the Battle Net. Please wait..." pw_kill_autostart Battle.net.exe & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_BETHESDA b/data_from_portwine/scripts/pw_autoinstall/PW_BETHESDA index b6f8a5f..dae9c6a 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_BETHESDA +++ b/data_from_portwine/scripts/pw_autoinstall/PW_BETHESDA @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("/VERYSILENT" ) export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/BethesdaNetLauncher_Setup.exe" start_portwine -if try_download "https://download.cdp.bethesda.net/BethesdaNetLauncher_Setup.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "download.cdp.bethesda.net/BethesdaNetLauncher_Setup.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Installing the BethesdaNetLauncher. Please wait..." pw_kill_autostart BethesdaNetLauncher.exe & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_CITRA b/data_from_portwine/scripts/pw_autoinstall/PW_CITRA index 014edda..f232acf 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_CITRA +++ b/data_from_portwine/scripts/pw_autoinstall/PW_CITRA @@ -4,7 +4,7 @@ #export LAUNCH_PARAMETERS=("") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/citra-setup-windows.exe" start_portwine -if try_download "https://github.com/citra-emu/citra-web/releases/download/1.0/citra-setup-windows.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "github.com/citra-emu/citra-web/releases/download/1.0/citra-setup-windows.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Installing the Citra. Please wait..." pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_DOLPHIN b/data_from_portwine/scripts/pw_autoinstall/PW_DOLPHIN index 0213949..fdab106 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_DOLPHIN +++ b/data_from_portwine/scripts/pw_autoinstall/PW_DOLPHIN @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("/S") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/dolphin-x64-5.0.exe" start_portwine -if try_download "https://dl-mirror.dolphin-emu.org/5.0/dolphin-x64-5.0.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "dl-mirror.dolphin-emu.org/5.0/dolphin-x64-5.0.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Installing the Dolphin 5.0. Please wait..." pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_DUCKSTATION b/data_from_portwine/scripts/pw_autoinstall/PW_DUCKSTATION index 18658a2..44a02e1 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_DUCKSTATION +++ b/data_from_portwine/scripts/pw_autoinstall/PW_DUCKSTATION @@ -3,7 +3,7 @@ ######################################################################## export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/duckstation-windows-x64-release.zip" start_portwine -if try_download "https://github.com/stenzek/duckstation/releases/download/preview/duckstation-windows-x64-release.zip" "${PW_AUTOINSTALL_EXE}" +if try_download "github.com/stenzek/duckstation/releases/download/preview/duckstation-windows-x64-release.zip" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Installing the VBA-M. Please wait..." "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)/Duckstation" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EPIC b/data_from_portwine/scripts/pw_autoinstall/PW_EPIC index 94bcfb5..3095fab 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_EPIC +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EPIC @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("/q" ) export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/EpicGamesLauncherInstaller.msi" start_portwine -if try_download "https://launcher-public-service-prod06.ol.epicgames.com/launcher/api/installer/download/EpicGamesLauncherInstaller.msi" "${PW_AUTOINSTALL_EXE}" +if try_download "launcher-public-service-prod06.ol.epicgames.com/launcher/api/installer/download/EpicGamesLauncherInstaller.msi" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Installing Epic Games Launcher. Please wait..." # pw_kill_autostart EpicGamesLauncher.exe & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EPSXE b/data_from_portwine/scripts/pw_autoinstall/PW_EPSXE index 32bd1d9..acf7b6b 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_EPSXE +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EPSXE @@ -3,7 +3,7 @@ ######################################################################## export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/ePSXe205.zip" start_portwine -if try_download "http://www.epsxe.com/files/ePSXe205.zip" "${PW_AUTOINSTALL_EXE}" +if try_download "www.epsxe.com/files/ePSXe205.zip" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Installing the VBA-M. Please wait..." "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)/EPSXe" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EVE b/data_from_portwine/scripts/pw_autoinstall/PW_EVE index f84fcbb..9915901 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_EVE +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EVE @@ -5,7 +5,7 @@ export PW_WINDOWS_VER=10 export PW_DLL_INSTALL="vcrun2017" export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/EveLauncher-1892908.exe" start_portwine -if try_download "https://binaries.eveonline.com/EveLauncher-1892908.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "binaries.eveonline.com/EveLauncher-1892908.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Installing the EVE Launcher. Please wait..." if [ ! -f "$WINEPREFIX/drive_c/Games/EVE Online/Launcher/evelauncher.exe" ] ; then diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_GAMEFORGE b/data_from_portwine/scripts/pw_autoinstall/PW_GAMEFORGE index d2ad828..c3e8621 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_GAMEFORGE +++ b/data_from_portwine/scripts/pw_autoinstall/PW_GAMEFORGE @@ -22,7 +22,7 @@ pw_shutdown_please () { export LAUNCH_PARAMETERS=("") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/GameforgeInstaller.exe" start_portwine -if try_download "https://raw.githubusercontent.com/WarfaceZ/lutris-clients/master/GameforgeInstaller.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "raw.githubusercontent.com/WarfaceZ/lutris-clients/master/GameforgeInstaller.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Gameforge-Client. Please wait..." pw_shutdown_please SparkWebHelper.exe & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_GLYPH b/data_from_portwine/scripts/pw_autoinstall/PW_GLYPH index 81c43f7..5fe204f 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_GLYPH +++ b/data_from_portwine/scripts/pw_autoinstall/PW_GLYPH @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("/S" ) export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/GlyphInstall.exe" start_portwine -if try_download "http://download.dyn.triongames.com/GlyphInstall.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "download.dyn.triongames.com/GlyphInstall.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Installing the GlyphClient. Please wait..." pw_kill_autostart GlyphClient.exe & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_GOG b/data_from_portwine/scripts/pw_autoinstall/PW_GOG index 637fc5f..b63b6c2 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_GOG +++ b/data_from_portwine/scripts/pw_autoinstall/PW_GOG @@ -5,7 +5,7 @@ export LAUNCH_PARAMETERS=("/VERYSILENT") export GOG_VER=2.0.46.133 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/setup_galaxy_${GOG_VER}.exe" start_portwine -if try_download "https://content-system.gog.com/open_link/download?path=/open/galaxy/client/${GOG_VER}/setup_galaxy_${GOG_VER}.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "content-system.gog.com/open_link/download?path=/open/galaxy/client/${GOG_VER}/setup_galaxy_${GOG_VER}.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Installing the GOG Galaxy. Please wait..." pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ITCH b/data_from_portwine/scripts/pw_autoinstall/PW_ITCH index df6cb2e..04509af 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_ITCH +++ b/data_from_portwine/scripts/pw_autoinstall/PW_ITCH @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("--silent") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/itch-setup.exe" start_portwine -if try_download "https://itch.io/app/download?platform=windows" "${PW_AUTOINSTALL_EXE}" +if try_download "itch.io/app/download?platform=windows" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Installing the ITCH.IO. Please wait..." pw_kill_autostart itch.exe & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_LOL b/data_from_portwine/scripts/pw_autoinstall/PW_LOL index 57b0d69..8394b73 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_LOL +++ b/data_from_portwine/scripts/pw_autoinstall/PW_LOL @@ -10,7 +10,7 @@ export PW_WINE_USE=WINE_LOL_GE_7.0-1 export WINEDLLOVERRIDES="mscoree,mshtml=" if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then - if try_download "https://github.com/Castro-Fidel/wine_builds/releases/download/${PW_WINE_USE}/${PW_WINE_USE}.tar.xz" \ + if try_download "github.com/Castro-Fidel/wine_builds/releases/download/${PW_WINE_USE}/${PW_WINE_USE}.tar.xz" \ "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" ; then if unpack_tar_xz "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" "${PORT_WINE_PATH}/data/dist/" ; then try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" @@ -23,7 +23,7 @@ if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then [[ "${UNPACK_STATUS}" != 0 ]] && exit 1 fi start_portwine -if try_download "https://lol.secure.dyn.riotcdn.net/channels/public/x/installer/current/live.na.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "lol.secure.dyn.riotcdn.net/channels/public/x/installer/current/live.na.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Installing League of Legends. Please wait..." zenity --info --width=500 --text "You must click the install button without changing the settings!" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_MAME b/data_from_portwine/scripts/pw_autoinstall/PW_MAME index 2cb4308..dfd354b 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_MAME +++ b/data_from_portwine/scripts/pw_autoinstall/PW_MAME @@ -3,7 +3,7 @@ ######################################################################## export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/mame0237b_64bit.exe" start_portwine -if try_download "https://github.com/mamedev/mame/releases/download/mame0237/mame0237b_64bit.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "github.com/mamedev/mame/releases/download/mame0237/mame0237b_64bit.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Installing the MAME. Please wait..." "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)/Mame" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_MYGAMES b/data_from_portwine/scripts/pw_autoinstall/PW_MYGAMES index 7751bd0..4b0b366 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_MYGAMES +++ b/data_from_portwine/scripts/pw_autoinstall/PW_MYGAMES @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/MyGamesLoader.exe" start_portwine -if try_download "https://static.gc.my.games/MyGamesLoader.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "static.gc.my.games/MyGamesLoader.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Installing the My.Games. Please wait..." pw_kill_autostart GameCenter.exe & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ORIGIN b/data_from_portwine/scripts/pw_autoinstall/PW_ORIGIN index 79e3a02..052cfae 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_ORIGIN +++ b/data_from_portwine/scripts/pw_autoinstall/PW_ORIGIN @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("/silent" ) export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/OriginSetup.exe" start_portwine -if try_download "https://download.dm.origin.com/origin/live/OriginSetup.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "download.dm.origin.com/origin/live/OriginSetup.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Installing the Origin. Please wait..." pw_kill_autostart Origin.exe & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_OSU b/data_from_portwine/scripts/pw_autoinstall/PW_OSU index bb0555c..937d85c 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_OSU +++ b/data_from_portwine/scripts/pw_autoinstall/PW_OSU @@ -6,7 +6,7 @@ start_portwine export PW_DLL_INSTALL="dotnet48" mkdir -p "${WINEPREFIX}/drive_c/Program Files (x86)/OSU/" export PW_AUTOINSTALL_EXE="${WINEPREFIX}/drive_c/Program Files (x86)/OSU/osu!.exe" -if try_download "https://m1.ppy.sh/r/osu!install.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "m1.ppy.sh/r/osu!install.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Installing the OSU!. Please wait..." if [ -f "${PORT_WINE_PATH}/data/pfx_dotnet/drive_c/Program Files (x86)/OSU/osu!install.exe" ]; then diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_PPSSPP b/data_from_portwine/scripts/pw_autoinstall/PW_PPSSPP index 658e9b5..e2bedf3 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_PPSSPP +++ b/data_from_portwine/scripts/pw_autoinstall/PW_PPSSPP @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("/VERYSILENT") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/PPSSPPSetup.exe" start_portwine -if try_download "https://www.ppsspp.org/files/1_12_3/PPSSPPSetup.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "www.ppsspp.org/files/1_12_3/PPSSPPSetup.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Installing the PPSSPPS. Please wait..." pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_PROJECT64 b/data_from_portwine/scripts/pw_autoinstall/PW_PROJECT64 index 4b4db99..db9462f 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_PROJECT64 +++ b/data_from_portwine/scripts/pw_autoinstall/PW_PROJECT64 @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("/VERYSILENT") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Setup Project64 3.0.1-5664-2df3434.exe" start_portwine -if try_download "https://www.pj64-emu.com/file/setup-project64-3-0-0-5632-f83bee9/" "${PW_AUTOINSTALL_EXE}" +if try_download "www.pj64-emu.com/file/setup-project64-3-0-0-5632-f83bee9/" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Installing the Project64. Please wait..." pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_RETROARCH b/data_from_portwine/scripts/pw_autoinstall/PW_RETROARCH index aeac2c0..3ec7056 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_RETROARCH +++ b/data_from_portwine/scripts/pw_autoinstall/PW_RETROARCH @@ -3,7 +3,7 @@ ######################################################################## export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/RetroArch.7z" start_portwine -if try_download "https://buildbot.libretro.com/stable/1.9.13/windows/x86_64/RetroArch.7z" "${PW_AUTOINSTALL_EXE}" +if try_download "buildbot.libretro.com/stable/1.9.13/windows/x86_64/RetroArch.7z" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Installing the RetroArch. Please wait..." "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR b/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR index 4281021..74399a7 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR +++ b/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR @@ -3,7 +3,7 @@ ######################################################################## export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Rockstar-Games-Launcher.exe" start_portwine -if try_download "https://web.archive.org/web/20210708074247if_/https://gamedownloads.rockstargames.com/public/installer/Rockstar-Games-Launcher.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "web.archive.org/web/20210708074247if_/gamedownloads.rockstargames.com/public/installer/Rockstar-Games-Launcher.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Rockstar-Games-Launcher. Please wait..." "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files/Rockstar Games/Launcher" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_SCUMMVM b/data_from_portwine/scripts/pw_autoinstall/PW_SCUMMVM index d1c6241..1d32c88 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_SCUMMVM +++ b/data_from_portwine/scripts/pw_autoinstall/PW_SCUMMVM @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("/VERYSILENT") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/scummvm-2.5.0-win32.exe" start_portwine -if try_download "https://downloads.scummvm.org/frs/scummvm/2.5.0/scummvm-2.5.0-win32.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "downloads.scummvm.org/frs/scummvm/2.5.0/scummvm-2.5.0-win32.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Installing the ScummVM. Please wait..." #pw_kill_autostart launcher101xp.exe & @@ -21,4 +21,4 @@ stop_portwine #/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP- -#https://downloads.scummvm.org/frs/scummvm/2.5.0/scummvm-2.5.0-win32.exe +#downloads.scummvm.org/frs/scummvm/2.5.0/scummvm-2.5.0-win32.exe diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_STEAM b/data_from_portwine/scripts/pw_autoinstall/PW_STEAM index 6928aa9..dafe206 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_STEAM +++ b/data_from_portwine/scripts/pw_autoinstall/PW_STEAM @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("/S" "/D=c:\Program Files (x86)\Steam") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/SteamSetup.exe" start_portwine -if try_download "https://cdn.cloudflare.steamstatic.com/client/installer/SteamSetup.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "cdn.cloudflare.steamstatic.com/client/installer/SteamSetup.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_cs "Installing the Steam. Please wait..." pw_kill_autostart steam.exe & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_UBC b/data_from_portwine/scripts/pw_autoinstall/PW_UBC index 5474208..2047cbc 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_UBC +++ b/data_from_portwine/scripts/pw_autoinstall/PW_UBC @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("/S" "/D=c:\Program Files (x86)\Ubisoft Game Launcher") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/UbisoftConnectInstaller.exe" start_portwine -if try_download "https://ubistatic3-a.akamaihd.net/orbit/launcher_installer/UbisoftConnectInstaller.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "ubistatic3-a.akamaihd.net/orbit/launcher_installer/UbisoftConnectInstaller.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_cs "Installing the Ubisoft Connect. Please wait..." pw_kill_autostart UbisoftConnect.exe & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_VBA-M b/data_from_portwine/scripts/pw_autoinstall/PW_VBA-M index 8c34190..941e9bd 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_VBA-M +++ b/data_from_portwine/scripts/pw_autoinstall/PW_VBA-M @@ -3,7 +3,7 @@ ######################################################################## export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/visualboyadvance-m-Win-64bit.zip" start_portwine -if try_download "https://github.com/visualboyadvance-m/visualboyadvance-m/releases/download/v2.1.4/visualboyadvance-m-Win-64bit.zip" "${PW_AUTOINSTALL_EXE}" +if try_download "github.com/visualboyadvance-m/visualboyadvance-m/releases/download/v2.1.4/visualboyadvance-m-Win-64bit.zip" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Installing the VBA-M. Please wait..." "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)/Visualboyadvance-m" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_WGC b/data_from_portwine/scripts/pw_autoinstall/PW_WGC index 709912f..641eeeb 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_WGC +++ b/data_from_portwine/scripts/pw_autoinstall/PW_WGC @@ -14,7 +14,7 @@ try_download_wgc () { } start_portwine -if try_download_wgc "https://redirect.wargaming.net/WGC/Wargaming_Game_Center_Install_WoT_${WGC_LOC}.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_wgc "redirect.wargaming.net/WGC/Wargaming_Game_Center_Install_WoT_${WGC_LOC}.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Starting WGC installation..." pw_kill_autostart wgc.exe & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_WOSB b/data_from_portwine/scripts/pw_autoinstall/PW_WOSB index 9a82fc7..fcae35f 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_WOSB +++ b/data_from_portwine/scripts/pw_autoinstall/PW_WOSB @@ -8,7 +8,7 @@ export PW_DLL_INSTALL="dotnet20sp2 dotnet48 faudio" export PW_VULKAN_USE=1 if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then - if try_download "https://github.com/Castro-Fidel/wine_builds/releases/download/${PW_WINE_USE}/${PW_WINE_USE}.tar.xz" \ + if try_download "github.com/Castro-Fidel/wine_builds/releases/download/${PW_WINE_USE}/${PW_WINE_USE}.tar.xz" \ "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" ; then if unpack_tar_xz "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" "${PORT_WINE_PATH}/data/dist/" ; then try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" @@ -21,7 +21,7 @@ if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then [[ "${UNPACK_STATUS}" != 0 ]] && exit 1 fi start_portwine -if try_download "https://165311.selcdn.ru/wosb_installer/wos_client.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "165311.selcdn.ru/wosb_installer/wos_client.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Installing World of Sea Battle. Please wait..." diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_YABAUSE b/data_from_portwine/scripts/pw_autoinstall/PW_YABAUSE index bfae2a3..81f6ab7 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_YABAUSE +++ b/data_from_portwine/scripts/pw_autoinstall/PW_YABAUSE @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("/S") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/yabause-0.9.15-win64.exe" start_portwine -if try_download "https://download.tuxfamily.org/yabause/releases/0.9.15/yabause-0.9.15-win64.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "download.tuxfamily.org/yabause/releases/0.9.15/yabause-0.9.15-win64.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Installing the Yabause. Please wait..." pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 4eeffb3..ba302f3 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -17,7 +17,7 @@ if [[ $(id -u) = 0 ]] ; then fi if [[ "${s_install}" != "1" && ! -x "`which "zenity" 2>/dev/null`" ]] ; then echo "You will need to install: zenity, and restart the port." - xdg-open "http://portwine-linux.ru/portwine-faq/" > /dev/null 2>&1 & exit 0 + xdg-open "portwine-linux.ru/portwine-faq/" > /dev/null 2>&1 & exit 0 fi . "$(dirname $(readlink -f "$0"))/functions_helper" @@ -30,7 +30,7 @@ start_portwine () { export PW_WINE_USE="${PW_PROTON_PW_VER}" echo "Force to use $PW_WINE_USE" if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then - if try_download "https://github.com/Castro-Fidel/wine_builds/releases/download/${PW_WINE_USE}/${PW_WINE_USE}.tar.xz" \ + if try_download "github.com/Castro-Fidel/wine_builds/releases/download/${PW_WINE_USE}/${PW_WINE_USE}.tar.xz" \ "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" ; then if unpack_tar_xz "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" "${PORT_WINE_PATH}/data/dist/" ; then try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" @@ -80,6 +80,7 @@ start_portwine () { export VKD3D_SHADER_DEBUG="none" export VKD3D_DEBUG="none" export DXVK_LOG_PATH="none" + export VKBASALT_LOG_LEVEL="none" fi #default wine-mono override for FNA games @@ -209,6 +210,7 @@ start_portwine () { if [[ -x "`which "gamemoderun" 2>/dev/null`" ]] && [[ "$PW_USE_GAMEMODE" = "1" ]] ; then export GAMEMODERUN=1 PW_GAMEMODERUN_SLR="gamemoderun" + systemctl enable --now --user gamemoded &>/dev/null echo "Gamemod will be launched." else export GAMEMODERUN=0 @@ -285,7 +287,13 @@ start_portwine () { if [[ "${PW_D3D_EXTRAS_DISABLE}" != 1 ]] ; then var_winedlloverride_update "${d3d_extras_from_plugins}=n,b" fi + if [[ -z "`grep "${d3d_extras_from_plugins}" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log"`" ]] ; then + echo "${d3d_extras_from_plugins}" >> "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" + fi done + if [[ -z "`grep d3dx9 "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log"`" ]] ; then + echo "d3dx9" >> "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" + fi var_winedlloverride_update "steam_api,steam_api64,steamclient,steamclient64=n;lsteamclient,winemenubuilder.exe=" # export TOTAL_VRAM=`"${PW_WINELIB}/runtime/files/bin/glxinfo" -B | grep Total | awk -F: '{print $2}' | awk '{print $1}'` @@ -293,8 +301,8 @@ start_portwine () { if [[ "${PW_VULKAN_USE}" == "0" ]] ; then echo "Use OpenGL" - export MESA_GLSL_CACHE_DIR="${PORT_WINE_TMP_PATH}" export GL_YIELD="NOTHING" + export mesa_glthread=true echo "Try link wine DXGI..." if ! try_force_link_file "${WINEDIR}"/lib/wine/fakedlls/dxgi.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/dxgi.dll" then try_force_link_file "${WINEDIR}"/lib/wine/i386-windows/dxgi.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/dxgi.dll" @@ -337,15 +345,14 @@ start_portwine () { zenity_error "d3dadapter9.so.1.0.0 - ${loc_find_d3dadapter9_error}" stop_portwine fi - export LIBGL_ALWAYS_SOFTWARE=true + export mesa_glthread=true export PW_DX12_DISABLE=1 export ENABLE_VKBASALT=0 export PW_MANGOHUD=0 export WINE_FULLSCREEN_FSR=0 - export __GLX_VENDOR_LIBRARY_NAME=mesa else echo "Use VKD3D-PROTON and DXVK (DX 9-12 to vulkan)" - if [[ ! -z "${PW_USE_AMDVLK_DRIVER}" && "${PW_USE_AMDVLK_DRIVER}" != 0 ]] ; then + if [[ ! -z "${PW_USE_AMDVLK_DRIVER}" ]] && [[ "${PW_USE_AMDVLK_DRIVER}" != 0 ]] ; then export AMD_VULKAN_ICD=AMDVLK print_info "Try to use AMDVLK driver (only with MESA)" else @@ -354,7 +361,7 @@ start_portwine () { fi export VKD3D_FEATURE_LEVEL="12_0" export __GL_DXVK_OPTIMIZATIONS=1 - + var_vkd3d_config_update no_upload_hvv export CP_DXVK_FILES="d3d11 d3d10 d3d10core d3d10_1 d3d9 dxgi dxvk_config openvr_api_dxvk" echo "Try link native DXVK files..." for wine_dxvk_dll in ${CP_DXVK_FILES} ; do @@ -397,15 +404,17 @@ start_portwine () { fi if [[ "${PW_USE_SHADER_CACHE}" == 1 ]] ; then + export MESA_GLSL_CACHE_DIR="${PORT_WINE_TMP_PATH}" create_new_dir "${PORT_WINE_TMP_PATH}/gl_shader_cache" - export __GL_SHADER_DISK_CACHE_PATH="${PORT_WINE_TMP_PATH}/gl_shader_cache" export __GL_SHADER_DISK_CACHE=1 + export __GL_SHADER_DISK_CACHE_PATH="${PORT_WINE_TMP_PATH}/gl_shader_cache" export __GL_SHADER_DISK_CACHE_SIZE=1000000000 create_new_dir "${PORT_WINE_TMP_PATH}/dxvk_cache" export DXVK_STATE_CACHE_PATH="${PORT_WINE_TMP_PATH}"/dxvk_cache export DXVK_STATE_CACHE=1 create_new_dir "${PORT_WINE_TMP_PATH}/vkd3d_cache" export VKD3D_SHADER_CACHE_PATH="${PORT_WINE_TMP_PATH}/vkd3d_cache" + var_vkd3d_config_update pipeline_library_app_cache else export __GL_SHADER_DISK_CACHE=0 export DXVK_STATE_CACHE=0 @@ -518,7 +527,7 @@ fi unset MANGOHUD MANGOHUD_DLSYM PW_NO_ESYNC PW_NO_FSYNC PW_VULKAN_USE WINEDLLOVERRIDES PW_NO_WRITE_WATCH PW_YAD_SET PW_ICON_FOR_YAD unset PW_CHECK_AUTOINSTAL PW_VKBASALT_EFFECTS PW_VKBASALT_FFX_CAS PORTWINE_DB PORTWINE_DB_FILE PW_DISABLED_CREATE_DB unset CHK_SYMLINK_FILE MESA_GL_VERSION_OVERRIDE PATH_TO_GAME PW_START_DEBUG PORTPROTON_NAME PORTWINE_CREATE_SHORTCUT_NAME -unset PW_PREFIX_NAME WINEPREFIX VULKAN_MOD PW_WINE_VER PW_ADD_TO_ARGS_IN_RUNTIME PW_GAMEMODERUN_SLR +unset PW_PREFIX_NAME WINEPREFIX VULKAN_MOD PW_WINE_VER PW_ADD_TO_ARGS_IN_RUNTIME PW_GAMEMODERUN_SLR AMD_VULKAN_ICD export portname=PortProton @@ -596,7 +605,7 @@ fi . "${PORT_SCRIPTS_PATH}"/lang . "${PORT_SCRIPTS_PATH}"/zen_yad_gui -export urlg="https://portwine-linux.ru/portwine-faq/" +export urlg="portwine-linux.ru/portwine-faq/" export PW_WINELIB="${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}" try_remove_dir "${PW_WINELIB}/var" export PW_GUI_ICON_PATH="${PORT_WINE_PATH}/data/img/gui" diff --git a/data_from_portwine/scripts/setup.sh b/data_from_portwine/scripts/setup.sh index 2cf3bd3..3f259e7 100755 --- a/data_from_portwine/scripts/setup.sh +++ b/data_from_portwine/scripts/setup.sh @@ -61,6 +61,6 @@ if [ "${PW_SILENT_INSTALL}" = "1" ] ; then fi else `zenity --info --title "${inst_set_top}" --text "${inst_succ}" --no-wrap ` > /dev/null 2>&1 - xdg-open "http://portwine-linux.ru/portwine-faq/" > /dev/null 2>&1 & exit 0 + xdg-open "portwine-linux.ru/portwine-faq/" > /dev/null 2>&1 & exit 0 fi unset INSTALLING_PORT \ No newline at end of file diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 08d35d6..4db75ec 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -138,12 +138,12 @@ portwine_start_debug () { fi echo "-------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" if [[ "${PW_D3D_EXTRAS_DISABLE}" == 1 ]] - then echo "D3D_EXTRAS - disable" >> "${PORT_WINE_PATH}/${portname}.log" - else echo "D3D_EXTRAS - enable" >> "${PORT_WINE_PATH}/${portname}.log" + then echo "D3D_EXTRAS - disabled" >> "${PORT_WINE_PATH}/${portname}.log" + else echo "D3D_EXTRAS - enabled" >> "${PORT_WINE_PATH}/${portname}.log" fi echo echo "------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" - echo "winetricks.log:" >> "${PORT_WINE_PATH}/${portname}.log" + echo "winetricks.log:" | grep -v 'd3dcomp|d3dx' >> "${PORT_WINE_PATH}/${portname}.log" cat "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" >> "${PORT_WINE_PATH}/${portname}.log" echo "-----------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" if [ ! -z "${PORTWINE_DB_FILE}" ]; then @@ -413,8 +413,8 @@ gui_about_portproton () { --comments="Порт для запуска Windows игр и приложений в GNU/Linux" \ --license=MIT \ --authors="Castro-Fidel",,"Выражаем особую благодарность в помоще проекту:",Cefeiko,Dezert1r,Taz_mania,Anton_Famillianov,gavr,RidBowt,chal55rus,UserDiscord \ - --website=https://portwine-linux.ru/ \ - --website-label=https://portwine-linux.ru + --website=portwine-linux.ru/ \ + --website-label=portwine-linux.ru } export -f gui_about_portproton diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 5c9283d..bea5b88 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,9 +1,9 @@ #!/usr/bin/env bash #Author: Castro-Fidel (PortWINE-Linux.ru) -#SCRIPTS_NEXT_VERSION=2101 +#SCRIPTS_NEXT_VERSION=2102 ######################################################################## export PW_MANGOHUD=0 -export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt,gamemode +export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt #export DXVK_HUD=compiler #export GALLIUM_HUD=fps #export ENABLE_VKBASALT=1 @@ -22,7 +22,7 @@ export PW_WINEDBG_DISABLE=1 export PW_WINDOWS_VER="10" export WINEARCH="win64" export PW_LIBS_VER="_v28" -export PORTWINE_URL="http://portwine-linux.ru/" +export PORTWINE_URL="portwine-linux.ru/" export GDK_BACKEND="x11" export PW_USE_GSTREAMER="1" export PW_PREFIX_NAME="DEFAULT" diff --git a/data_from_portwine/scripts/zen_yad_gui b/data_from_portwine/scripts/zen_yad_gui index 2e0c81f..7a176ce 100644 --- a/data_from_portwine/scripts/zen_yad_gui +++ b/data_from_portwine/scripts/zen_yad_gui @@ -185,7 +185,7 @@ pw_gui_for_edit_db () { --field=":LBL" "" \ --field="ADD ARGUMENTS FOR .EXE FILE::CBE" "\\${LAUNCH_PARAMETERS[@]}!-dx11 -skipintro 1" \ --field=":LBL" "" \ - --field="MANGOHUD FPS LIMIT (0-disabled):SCL" ${FPS_LIMIT_VAR} 1> "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" & + --field="MANGOHUD FPS LIMIT (0-disabled):SCL" ${FPS_LIMIT_VAR} 2>/dev/null 1> "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" & "${pw_yad_new}" --paned --key="$KEY_EDIT_DB_GUI" --title "EDIT_DB" --text-align=center --height="550" \ --text "Change settings in database file for ${PORTWINE_DB}\n" --separator=" " --borders=10 --center \ @@ -215,10 +215,8 @@ pw_gui_for_edit_db () { LAUNCH_PARAMETERS=`cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" | awk -F"%" '{print $5}'` FPS_LIMIT="`cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" | awk -F"%" '{print $7}'`" - if [ "${FPS_LIMIT}" == 0 ] ; then - export MANGOHUD_CONFIG=font_size=24,position=top-left,toggle_hud=Shift_R+F12,no_display,resolution,wine,gpu_name,vulkan_driver,gpu_stats,vkbasalt - else - export MANGOHUD_CONFIG=font_size=24,position=top-left,toggle_hud=Shift_R+F12,no_display,resolution,wine,gpu_name,vulkan_driver,gpu_stats,vkbasalt,fps_limit=${FPS_LIMIT} + if [ "${FPS_LIMIT}" != 0 ] ; then + export MANGOHUD_CONFIG=${MANGOHUD_CONFIG},fps_limit=${FPS_LIMIT} fi echo "pw_gui_for_edit_db PORTWINE_DB_FILE=$PORTWINE_DB_FILE" edit_db_from_gui $@ MANGOHUD_CONFIG LAUNCH_PARAMETERS PW_WINDOWS_VER PW_DLL_INSTALL WINEDLLOVERRIDES