diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru index e23f2f2..961937d 100755 --- a/data_from_portwine/changelog_ru +++ b/data_from_portwine/changelog_ru @@ -2,10 +2,14 @@ ----------------------------------------- История изменений: -* +###Scripts version 2353### / Дата: 27.09.2024 / Размер скачиваемого обновления: 4 мегабайт +* оптимизированы функции автоустановки всех игр/лаунчеров +* ускорен первичный запуск PortProton (спасибо Htylol) * удалена автоустановка эмулятора "CITRA" * обновлена автоустановка эмулятора "CEMU" * возвращена установка игры "Secret World Legends (ENG)" +* исправлена и обновлена автоустановка иры "OSU!" +* улучшена функция скачивания сторонних версий WINE * добавлены файлы настроек для игр (спасибо Мэлс): * LEGO Star Wars: The Skywalker Saga * God of War Ragnarok diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index ed25dc5..56b7870 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -419,6 +419,10 @@ check_process () { export -f check_process try_check_sha256sum () { + if [[ "$no_mirror" == true ]] ; then + print_ok "Used no_mirror downloading. Skipping check sha256sum." + return 0 + fi SHA256SUM_EXT=$(curl --silent -L "${1//.tar*/}.sha256sum" | awk '{print $1}') if [[ ${#SHA256SUM_EXT} == 64 ]] ; then SHA256SUM_INT=$(sha256sum "$dest" | awk '{print $1}') @@ -438,7 +442,7 @@ try_check_sha256sum () { try_download () { export dest="$2" local silent="false" - local no_mirror="false" + export no_mirror="false" case "$3" in silent) @@ -3991,7 +3995,11 @@ gui_proton_downloader () { pw_download_get_wine () { print_info "Download and install ${VERSION_WINE_GIT}..." FILENAME="$(basename "${URL_VERSION_PROTON_GIT}")" - if try_download "${URL_VERSION_PROTON_GIT}" "${PORT_WINE_PATH}/data/tmp/$FILENAME" ; then + if [[ "${URL_VERSION_PROTON_GIT}" =~ _LG ]] + then USE_MIRROR="" + else USE_MIRROR="no_mirror" + fi + if try_download "${URL_VERSION_PROTON_GIT}" "${PORT_WINE_PATH}/data/tmp/$FILENAME" "$USE_MIRROR" ; then if unpack "${PORT_WINE_PATH}/data/tmp/${FILENAME}" "${PORT_WINE_PATH}/data/dist/" ; then try_remove_file "${PORT_WINE_PATH}/data/tmp/${FILENAME}" if [[ -n "${portwine_exe}" ]] ; then @@ -4039,7 +4047,6 @@ gui_proton_downloader () { edit_db_from_gui restart_pp else - # init_wine_ver print_error "$PW_WINE_USE" for GIVE_WINE_URL in ${WINE_GE_CUSTOM[@]} ${PROTON_GE_GIT[@]} ${WINE_KRON4EK[@]} ${PROTON_PW_GIT[@]} ; do if [[ -n $(echo ${GIVE_WINE_URL} | grep -i "${PW_WINE_USE}") ]] ; then diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ITCH b/data_from_portwine/scripts/pw_autoinstall/PW_ITCH index a91f2e9..fb0a209 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_ITCH +++ b/data_from_portwine/scripts/pw_autoinstall/PW_ITCH @@ -3,14 +3,14 @@ ########################################################################## 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}" no_mirror then pw_start_progress_bar_install_game "ITCH.IO." pw_kill_autostart itch.exe & pw_run "${PW_AUTOINSTALL_EXE}" - portwine_exe=`find "$WINEPREFIX/drive_c/users" -type f -name "itch.exe"` - # portwine_exe="$WINEPREFIX/drive_c/users/steamuser/AppData/Local/itch/app-25.5.1/itch.exe" + portwine_exe=$(find "$WINEPREFIX/drive_c/users" -type f -name "itch.exe") try_remove_file "${PW_AUTOINSTALL_EXE}" try_remove_file "${portwine_exe}.ppdb" kill_portwine diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_OSU b/data_from_portwine/scripts/pw_autoinstall/PW_OSU index 19a928a..512815d 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_OSU +++ b/data_from_portwine/scripts/pw_autoinstall/PW_OSU @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Author: cefeiko ######################################################################## -export PW_PREFIX_NAME=DOTNET +export PW_PREFIX_NAME="OSU" export PORTWINE_CREATE_SHORTCUT_NAME="OSU" start_portwine @@ -18,10 +18,9 @@ then export portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/OSU/osu!.exe" pw_create_unique_exe try_remove_file "${portwine_exe}.ppdb" - # pw_run "${PW_AUTOINSTALL_EXE}" pw_stop_progress_bar portwine_create_shortcut kill_portwine fi -stop_portwine +stop_portwine \ No newline at end of file diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_PULSE_ONLINE b/data_from_portwine/scripts/pw_autoinstall/PW_PULSE_ONLINE index 3ad94b8..7436246 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_PULSE_ONLINE +++ b/data_from_portwine/scripts/pw_autoinstall/PW_PULSE_ONLINE @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Author: cefeiko ######################################################################## -export PW_PREFIX_NAME=DOTNET +export PW_PREFIX_NAME="DOTNET" export PORTWINE_CREATE_SHORTCUT_NAME="Pulse Online" start_portwine diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_VKPLAY b/data_from_portwine/scripts/pw_autoinstall/PW_VKPLAY index 2c0e9b4..1ef7e71 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_VKPLAY +++ b/data_from_portwine/scripts/pw_autoinstall/PW_VKPLAY @@ -6,6 +6,7 @@ export PW_PREFIX_NAME="VK_PLAY" export PW_AUTOINSTALL_EXE="${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/steamuser/AppData/Local/VKPlayLoader.exe" export WINEDLLOVERRIDES="mscoree,mshtml=" export PW_MUST_HAVE_DLL="" +export PW_WINE_USE="WINE_LG" start_portwine if try_download "https://static.gc.my.games/VKPlayLoader.exe" "${PW_AUTOINSTALL_EXE}" no_mirror diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 2335ffa..58ba80f 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=2352 +#SCRIPTS_NEXT_VERSION=2353 #SCRIPTS_STABLE_VERSION=2342 ######################################################################## # export PROTON_USE_XALIA="1"