From cc0300cb4394d9e93efefc325ba4a5e6b5412eda Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Wed, 7 Aug 2024 12:46:06 +0300 Subject: [PATCH] Scripts version 2334 --- data_from_portwine/changelog_en | 8 + data_from_portwine/changelog_ru | 12 +- data_from_portwine/img/gui/notify_error.svg | 137 +++++++++++++++++ data_from_portwine/img/gui/notify_info.svg | 138 ++++++++++++++++++ data_from_portwine/img/gui/notify_warning.svg | 137 +++++++++++++++++ data_from_portwine/scripts/functions_helper | 45 +++--- .../scripts/portwine_db/ActOfWar.ppdb | 9 ++ data_from_portwine/scripts/start.sh | 2 +- data_from_portwine/scripts/var | 2 +- 9 files changed, 470 insertions(+), 20 deletions(-) create mode 100644 data_from_portwine/img/gui/notify_error.svg create mode 100644 data_from_portwine/img/gui/notify_info.svg create mode 100644 data_from_portwine/img/gui/notify_warning.svg create mode 100644 data_from_portwine/scripts/portwine_db/ActOfWar.ppdb diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en index d796251..f130a29 100755 --- a/data_from_portwine/changelog_en +++ b/data_from_portwine/changelog_en @@ -2,6 +2,14 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2334### / Date: 07.08.2024 / Download update size: 4 megabytes +* service information has been transferred to pop-up notifications (thanks to Htylol, Xpamych, Dervart) +* added the ability to use pop-up notifications in flatpak (thanks to Boria138) +* added the ability to download experimental WINE_LG_NTSYNC +* added settings files for games (thanks to Eljeyna): + * Act of War - Direct Action + * Act of War - High Treason + ###Scripts version 2333### / Date: 06.08.2024 / Download update size: 4 megabytes * changed the download source from CDN to the project server cloud.linux-gaming.ru (thanks Xpamych) diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru index 4e376fa..004b393 100755 --- a/data_from_portwine/changelog_ru +++ b/data_from_portwine/changelog_ru @@ -2,8 +2,18 @@ ----------------------------------------- История изменений: +###Scripts version 2334### / Дата: 07.08.2024 / Размер скачиваемого обновления: 4 мегабайта +* служебная информация переведена на всплывающие оповещения (спасибо Htylol, Храмычъ, Dervart) +* добавлена возможность использования всплывающих оповещений во flatpak (спасибо Boria138) +* добавлена возможность скачивания экспериментального WINE_LG_NTSYNC +* добавлены файлы настроек для игр (спасибо Eljeyna): + * Act of War - Direct Action + * Act of War - High Treason + ###Scripts version 2333### / Дата: 06.08.2024 / Размер скачиваемого обновления: 4 мегабайта -* изменён источник скачивания с CDN (зеркало), на сервер проекта cloud.linux-gaming.ru (спасибо Храмычъ) +* создан новый сайт cloud.linux-gaming.ru (спасибо Храмычъ) +* изменён источник скачивания с CDN (зеркало), на сервер проекта cloud.linux-gaming.ru (спасибо @Помощники) +* добавлена верификация файлов после скачивания ###Scripts version 2332### / Дата: 05.08.2024 / Размер скачиваемого обновления: 4 мегабайта * исправлено отображение иконок для переименованных ярлыков (спасибо Arta48) diff --git a/data_from_portwine/img/gui/notify_error.svg b/data_from_portwine/img/gui/notify_error.svg new file mode 100644 index 0000000..ce6a670 --- /dev/null +++ b/data_from_portwine/img/gui/notify_error.svg @@ -0,0 +1,137 @@ + + + + diff --git a/data_from_portwine/img/gui/notify_info.svg b/data_from_portwine/img/gui/notify_info.svg new file mode 100644 index 0000000..e950590 --- /dev/null +++ b/data_from_portwine/img/gui/notify_info.svg @@ -0,0 +1,138 @@ + + + + diff --git a/data_from_portwine/img/gui/notify_warning.svg b/data_from_portwine/img/gui/notify_warning.svg new file mode 100644 index 0000000..77d93a7 --- /dev/null +++ b/data_from_portwine/img/gui/notify_warning.svg @@ -0,0 +1,137 @@ + + + + diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 3c83c38..3d8b342 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -1,6 +1,6 @@ #!/usr/bin/env bash # Author: Castro-Fidel (linux-gaming.ru) -# shellcheck disable=SC2140,SC2034 +# shellcheck disable=SC2140,SC2034,SC2068,SC2206 ######################################################################## $PW_DEBUG print_error () { printf "\E[31m%s Error: $@ %s\e[0m\n" ;} @@ -311,11 +311,11 @@ try_download () { if [[ "${MIRROR}" == CLOUD ]] \ && [[ "$no_mirror" != "true" ]] then - FIRST_URL=("$url_cloud/$filename" "-u" "portproton:portproton") - SECOND_URL=("$1") + FIRST_URL=("$url_cloud/$filename") + SECOND_URL=($1) else - FIRST_URL=("$1") - SECOND_URL=("$url_cloud/$filename" "-u" "portproton:portproton") + FIRST_URL=($1) + SECOND_URL=("$url_cloud/$filename") fi [[ ! -f "${pw_yad}" ]] && local pw_yad="yad" @@ -344,7 +344,7 @@ try_download () { if [[ "${PIPESTATUS[0]}" != 0 ]] ; then if [[ "$no_mirror" != "true" ]] ; then - print_warning "Failed download $filename from ${FIRST_URL[0]}, trying mirror..." + print_warning "Failed download $filename from ${FIRST_URL[0]}, trying mirror: ${SECOND_URL[0]}" curl -f -# -A 'Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)' -H 'Cache-Control: no-cache, no-store' \ -H 'Pragma: no-cache' -L ${SECOND_URL[@]} -o "$dest" 2>&1 | \ tr '\r' '\n' | sed -ur 's|[# ]+||g;s|.*=.*||g;s|.*|#Downloading at &\n&|g' | \ @@ -357,11 +357,21 @@ try_download () { return 1 else print_ok "File downloaded successfully: $filename from ${SECOND_URL[0]}" - try_check_sha256sum ${SECOND_URL[@]} && return 0 || return 1 + if try_check_sha256sum ${SECOND_URL[@]} ; then + return 0 + else + try_remove_file "$dest" + return 1 + fi fi fi print_ok "File downloaded successfully: $filename from ${FIRST_URL[0]}" - try_check_sha256sum ${FIRST_URL[@]} && return 0 || return 1 + if try_check_sha256sum ${SECOND_URL[@]} ; then + return 0 + else + try_remove_file "$dest" + return 1 + fi } var_winedlloverride_update () { @@ -412,6 +422,7 @@ var_ld_library_path_update () { return 0 } +# GUI NOTIFY SEND pw_notify_send () { if command -v gdbus &>/dev/null ; then local app="PortProton" @@ -1251,7 +1262,7 @@ pw_check_and_download_plugins () { fi fi else - pw_notify_send -i info -t 10000 \ + pw_notify_send -i info \ "$(gettext "Please wait for update PortProton")" 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" silent ; then @@ -1267,7 +1278,7 @@ pw_check_and_download_plugins () { fi else print_error "Failed updating PortProton!" - pw_notify_send -i error -t 10000 \ + pw_notify_send -i error \ "$(gettext "Failed updating PortProton!")" fi fi @@ -5007,7 +5018,7 @@ portwine_start_debug () { kill_portwine export PW_LOG=1 if [[ -z "$VULKAN_DRIVER_NAME" ]] || [[ "$VULKAN_DRIVER_NAME" == "llvmpipe" ]] ; then - pw_notify_send -i warning -t 10000 \ + pw_notify_send -i warning \ "$(gettext "Attention working version of vulkan not detected!")" \ "$(gettext "It is recommended to run games in OpenGL (low performance possible)!")" fi @@ -5344,12 +5355,12 @@ export -f change_loc change_mirror () { if [[ "$MIRROR" == "CLOUD" ]] ; then sed -i 's/="CLOUD"/="GITHUB"/g' "$USER_CONF" - pw_notify_send -i info -t 10000 \ - "$(gettext "Mirror changed to:")" "GITHUB" + pw_notify_send -i info \ + "$(gettext "Mirror changed to:")" "https://github.com/Castro-Fidel" else sed -i 's/="GITHUB"/="CLOUD"/g' "$USER_CONF" - pw_notify_send -i info -t 10000 \ - "$(gettext "Mirror changed to:")" "CLOUD.LINUX-GAMING.RU" + pw_notify_send -i info \ + "$(gettext "Mirror changed to:")" "https://cloud.linux-gaming.ru" fi print_info "Restarting PP for change mirror..." export SKIP_CHECK_UPDATES="1" @@ -5383,11 +5394,11 @@ export -f change_branch change_gui_start () { if [[ "$PW_GUI_START" == "NOTEBOOK" ]] ; then sed -i 's/="NOTEBOOK"/="PANED"/g' "$USER_CONF" - pw_notify_send -i info -t 10000 \ + pw_notify_send -i info \ "$(gettext "Gui start changed to:")" "PANED" else sed -i 's/="PANED"/="NOTEBOOK"/g' "$USER_CONF" - pw_notify_send -i info -t 10000 \ + pw_notify_send -i info \ "$(gettext "Gui start changed to:")" "NOTEBOOK" fi print_info "Restarting PP for change gui start..." diff --git a/data_from_portwine/scripts/portwine_db/ActOfWar.ppdb b/data_from_portwine/scripts/portwine_db/ActOfWar.ppdb new file mode 100644 index 0000000..ef9b139 --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/ActOfWar.ppdb @@ -0,0 +1,9 @@ +#!/usr/bin/env bash +#Author: Eljeyna +#ActOfWar.exe +#ActOfWar_HighTreason.exe +#Rating=1-5 +export PW_WINE_USE="WINE-9.14-AMD64" +export PW_PREFIX_NAME="ACT_OF_WAR" + +gui_proton_downloader silent "$PW_WINE_USE" diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 21cfb48..7b17835 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Author: Castro-Fidel (linux-gaming.ru) # Development assistants: Cefeiko; Dezert1r; Taz_mania; Anton_Famillianov; gavr; RidBowt; chal55rus; UserDiscord; Boria138; Vano; Akai; Htylol -# shellcheck disable=SC2140,SC2119,SC2206 +# shellcheck disable=SC2140,SC2119,SC2206,SC2068 ######################################################################## echo ' █░░ █ █▄░█ █░█ ▀▄▀ ▄▄ █▀▀ ▄▀█ █▀▄▀█ █ █▄░█ █▀▀ ░ █▀█ █░█ diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index e392323..65c8037 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=2333 +#SCRIPTS_NEXT_VERSION=2334 #SCRIPTS_STABLE_VERSION=2327 ######################################################################## export LANGUAGES_LIST="ru es"