From 2d6be9b1b075e8601cbe8b1d80d8b296cd1a337f Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Fri, 15 Mar 2024 17:49:14 +0300 Subject: [PATCH] Scripts version 2264 --- data_from_portwine/changelog_eng | 4 ++++ data_from_portwine/changelog_rus | 4 ++++ data_from_portwine/img/gui/pulseonline.png | Bin 0 -> 8111 bytes data_from_portwine/scripts/credits | 6 +++-- data_from_portwine/scripts/lang | 4 ++-- .../scripts/portwine_db/PulseOnlineLauncher | 8 +++++++ .../scripts/pw_autoinstall/PW_PULSE_ONLINE | 21 ++++++++++++++++++ data_from_portwine/scripts/runlib | 3 +-- data_from_portwine/scripts/setup.sh | 4 +++- data_from_portwine/scripts/start.sh | 6 +++-- data_from_portwine/scripts/var | 2 +- data_from_portwine/scripts/yad_gui | 1 - 12 files changed, 52 insertions(+), 11 deletions(-) create mode 100644 data_from_portwine/img/gui/pulseonline.png create mode 100644 data_from_portwine/scripts/portwine_db/PulseOnlineLauncher create mode 100755 data_from_portwine/scripts/pw_autoinstall/PW_PULSE_ONLINE diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 60ab7a3a..03a42423 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,10 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2264### Date: 15.03.2024 / Download update size: 15 megabytes +* added the option to end the first PortProton session when starting the second +* added auto-installation of the game "Pulse Online" + ###Scripts version 2263### Date: 15.03.2024 / Download update size: 15 megabytes * the lock file of the second session has been moved to "/tmp/portproton.lock" * when starting from the terminal, it is clearly indicated that the lock file and its location have been found diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index e040c7fe..f8e76bb2 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,10 @@ ----------------------------------------- История изменений: +###Scripts version 2264### Дата: 15.03.2024 / Размер скачиваемого обновления: 15 мегабайт +* добавлен выбор завершения первой сессии PortProton при запуске второй +* добавлена автоустановка игры "Pulse Online" + ###Scripts version 2263### Дата: 15.03.2024 / Размер скачиваемого обновления: 15 мегабайт * файл блокировки второй сессии перенесен в "/tmp/portproton.lock" * при запуске с терминала, явно указано что найден файл блокировки и его месторасположение diff --git a/data_from_portwine/img/gui/pulseonline.png b/data_from_portwine/img/gui/pulseonline.png new file mode 100644 index 0000000000000000000000000000000000000000..5225ca0388c11eeca4af4cfe04fa5f31bad49be5 GIT binary patch literal 8111 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 ppE~}v;65$o{Icze$K!9jSLI5ps?cc/dev/null & --tab="О PORTPROTON" --tab="АВТОРЫ" --tab="ЛИЦЕНЗИЯ" --tab="СПОНСОРЫ" --tab="ПРИСОЕДИНИТЬСЯ" \ --tab="БИБЛИОТЕКИ" echo "Exit from credits" - /usr/bin/env bash -c ${pw_full_command_line[*]} + /usr/bin/env bash -c ${pw_full_command_line[*]} & + exit 0 else @@ -733,5 +734,6 @@ YAD: https://github.com/v1cont/yad" 2>/dev/null & --tab="THIRD PARTY LIBRARIES" echo "Exit from credits" - /usr/bin/env bash -c ${pw_full_command_line[*]} + /usr/bin/env bash -c ${pw_full_command_line[*]} & + exit 0 fi diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index e274e506..ba073687 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -128,7 +128,7 @@ if [[ "${update_loc}" == "RUS" ]] ; then export loc_gui_dll_new_pfx="Установить рекомендованные библиотеки в новый префикс: " - export loc_gui_portproton_lock='Завершите предыдущую сессию PortProton перед запуском новой,\nили воспользуйтесь ПКМ на значке в трее -> Завершить работу PortProton.' + export loc_gui_portproton_lock='Обнаружена запущенная сессия PortProton.\nХотите завершить предыдущую сессию?' export ENABLE_VKBASALT_INFO='Включить vkBasalt по умолчанию для улучшение графики в играх работающих под Vulkan. (Горячая клавиша HOME отключает vkbasalt)' export PW_NO_ESYNC_INFO='Не использовать примитивы внутрипроцессной синхронизации на основе eventfd. (Рекомендуется не изменять значение)' @@ -539,7 +539,7 @@ elif [[ "${update_loc}" == "ENG" ]] ; then export loc_gui_dll_new_pfx="Do you want to installing recommended libraries in the new prefix: " - export loc_gui_portproton_lock='End the previous PortProton session before starting a new one,\nor use the RMB on the tray icon -> Shut down PortProton.' + export loc_gui_portproton_lock='A running PortProton session was detected.\nDo you want to end the previous session?' export ENABLE_VKBASALT_INFO='Enable vkBasalt by default to improve graphics in games running on Vulkan. (The HOME hotkey disables vkbasalt)' export PW_NO_ESYNC_INFO='Do not use in-process synchronization primitives based on eventfd. (It is recommended not to change the value.)' diff --git a/data_from_portwine/scripts/portwine_db/PulseOnlineLauncher b/data_from_portwine/scripts/portwine_db/PulseOnlineLauncher new file mode 100644 index 00000000..4a8d45a4 --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/PulseOnlineLauncher @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +#Author: fidel +#PulseOnlineLauncher.exe +#Rating=5 +#####################examples########################### +export PW_VULKAN_USE="2" +export PW_WINE_USE="PROTON_LG" +export PW_PREFIX_NAME="DOTNET" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_PULSE_ONLINE b/data_from_portwine/scripts/pw_autoinstall/PW_PULSE_ONLINE new file mode 100755 index 00000000..0cd7cf7d --- /dev/null +++ b/data_from_portwine/scripts/pw_autoinstall/PW_PULSE_ONLINE @@ -0,0 +1,21 @@ +#!/usr/bin/env bash +# Author: cefeiko +######################################################################## +export PW_PREFIX_NAME=DOTNET +export PORTWINE_CREATE_SHORTCUT_NAME="Pulse Online" + +start_portwine + +mkdir -p "${WINEPREFIX}/drive_c/games/PulseOnline/" +export PW_AUTOINSTALL_EXE="${WINEPREFIX}/drive_c/games/PulseOnline/PulseOnlineLauncher.exe" + +if try_download_no_mirror "https://pulseonline.ru/game_download/PulseOnlineLauncher.exe" "${PW_AUTOINSTALL_EXE}" +then + export portwine_exe="$PW_AUTOINSTALL_EXE" + try_remove_file "${portwine_exe}.ppdb" + pw_stop_progress_bar + portwine_create_shortcut + kill_portwine +fi + +stop_portwine diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index a1af99e5..22ed8b5c 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -867,8 +867,7 @@ check_variables PW_LOG "0" if [[ -z "${INSTALLING_PORT}" ]] ; then if [[ -f "/tmp/portproton.lock" ]] ; then print_warning "Found lock file: /tmp/portproton.lock" - yad_info "$loc_gui_portproton_lock" - exit 0 + yad_question "$loc_gui_portproton_lock" || exit 0 fi touch "/tmp/portproton.lock" rm_lock_file () { diff --git a/data_from_portwine/scripts/setup.sh b/data_from_portwine/scripts/setup.sh index e85e5339..6096e171 100755 --- a/data_from_portwine/scripts/setup.sh +++ b/data_from_portwine/scripts/setup.sh @@ -31,7 +31,9 @@ else chmod u+x "${PORT_WINE_PATH}/${name_desktop}.desktop" fi -if [[ ! -f /usr/bin/portproton ]] ; then +if [[ ! -f /usr/bin/portproton ]] \ +&& ! grep -i "flatpak" /etc/os-release &>/dev/null +then cp -f "${PORT_WINE_PATH}/${name_desktop}.desktop" ${HOME}/.local/share/applications/ fi diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 1076a4ca..61c65d95 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -385,7 +385,8 @@ pw_prefix_manager () { else print_info "Nothing to do. Restarting PortProton..." stop_portwine & - /usr/bin/env bash -c ${pw_full_command_line[*]} + /usr/bin/env bash -c ${pw_full_command_line[*]} & + exit 0 fi } gui_prefix_manager @@ -852,7 +853,8 @@ else --field=" Genshin Impact"!"$PW_GUI_ICON_PATH/genshinimpact.png"!"":"FBTN" '@bash -c "button_click PW_GENSHIN_IMPACT"' \ --field=" EA App (TEST)"!"$PW_GUI_ICON_PATH/eaapp.png"!"":"FBTN" '@bash -c "button_click PW_EAAPP"' \ --field=" Battle Of Space Raiders"!"$PW_GUI_ICON_PATH/bsr.png"!"":"FBTN" '@bash -c "button_click PW_BSR"' \ - --field=" Black Desert Online (RU)"!"$PW_GUI_ICON_PATH/bdo.png"!"":"FBTN" '@bash -c "button_click PW_BDO"' 2>/dev/null & + --field=" Black Desert Online (RU)"!"$PW_GUI_ICON_PATH/bdo.png"!"":"FBTN" '@bash -c "button_click PW_BDO"' \ + --field=" Pulse Online"!"$PW_GUI_ICON_PATH/pulseonline.png"!"":"FBTN" '@bash -c "button_click PW_PULSE_ONLINE"' 2>/dev/null & # --field=" Secret World Legends (ENG)"!"$PW_GUI_ICON_PATH/swl.png"!"":"FBTN" '@bash -c "button_click PW_SWL"' # --field=" Bethesda.net Launcher"!"$PW_GUI_ICON_PATH/bethesda.png"!"":"FBTN" '@bash -c "button_click PW_BETHESDA"' diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 2afe5208..0e8db9a3 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=2263 +#SCRIPTS_NEXT_VERSION=2264 ######################################################################## 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/yad_gui b/data_from_portwine/scripts/yad_gui index 1a67902d..1bf9ce60 100755 --- a/data_from_portwine/scripts/yad_gui +++ b/data_from_portwine/scripts/yad_gui @@ -674,7 +674,6 @@ gui_MangoHud () { exit 0 } - portwine_create_shortcut () { pw_create_gui_png pw_stop_progress_bar